Bladeren bron

支付宝刷脸柜激活无需收费

李进 1 jaar geleden
bovenliggende
commit
309c4a3808

+ 1 - 0
device-api-service/src/main/java/com/xy/service/factory/device/impl/alipay/AliPayOpenDeviceFatoryImpl.java

@@ -75,6 +75,7 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
 
     @Override
     public R active(MercMiniDeviceDto.Active2 active) {
+        active.setIsDeviceAlgorithmCharging(false);
         R<List<MercMiniDeviceDto.ActiveVo>> result = openDeviceFactoryImpl.active(active);
         if (R.Enum.FAIL.getCode() == result.getCode()) {
             return result;

+ 2 - 2
device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -147,8 +147,8 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
         }
         //检查费用
         deviceIds.forEach(deviceId -> {
-            R deviceChargingCheck = deviceChargingService.check(new DeviceChargingDto.Check().setDeviceId(deviceId));
-            R deviceAlgorithmChargingCheck = deviceAlgorithmChargingService.check(new DeviceAlgorithmChargingDto.Check().setDeviceId(deviceId));
+            R deviceChargingCheck = active.getIsDeviceCharging() ? deviceChargingService.check(new DeviceChargingDto.Check().setDeviceId(deviceId)) : R.ok();
+            R deviceAlgorithmChargingCheck = active.getIsDeviceAlgorithmCharging() ? deviceAlgorithmChargingService.check(new DeviceAlgorithmChargingDto.Check().setDeviceId(deviceId)) : R.ok();
             if (deviceChargingCheck.getCode() != R.Enum.SUCCESS.getCode() && deviceAlgorithmChargingCheck.getCode() != R.Enum.SUCCESS.getCode()) {
                 MercMiniDeviceDto.ActiveVo activeVo = new MercMiniDeviceDto.ActiveVo()
                         .setDeviceId(deviceId)

+ 5 - 0
device-api/src/main/java/com/xy/dto/MercMiniDeviceDto.java

@@ -73,6 +73,11 @@ public class MercMiniDeviceDto {
         @ApiModelProperty("设备id")
         private List<Long> deviceId;
 
+        @ApiModelProperty(value = "验证管理费", hidden = true)
+        private Boolean isDeviceCharging = true;
+
+        @ApiModelProperty(value = "验证算法费", hidden = true)
+        private Boolean isDeviceAlgorithmCharging = true;
     }
 
     @Data