提现模式商户0元激活

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

@@ -14,6 +14,7 @@ import com.xy.collections.map.JMap;
 import com.xy.device.EnumDeviceActiveStatus;
 import com.xy.device.EnumDeviceBusyStatus;
 import com.xy.dto.*;
+import com.xy.dto.be.MercDto;
 import com.xy.entity.*;
 import com.xy.enums.SysCodeConfigureEnum;
 import com.xy.mapper.DeviceCreateIdsMapper;
@@ -21,6 +22,7 @@ import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.DeviceStatusMapper;
 import com.xy.mapper.DeviceSysinfoMapper;
 import com.xy.service.*;
+import com.xy.service.be.MercService;
 import com.xy.service.factory.cmd.CmdService;
 import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
@@ -71,6 +73,8 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
 
     private DeviceFaultMonitorConfigServiceImpl deviceFaultMonitorConfigService;
 
+    private MercService mercService;
+
     @Override
     public R save(DeviceRegisterDto.Save save) {
         LocalDateTime now = LocalDateTime.now();
@@ -150,6 +154,11 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
         if (count > 0) {
             return R.fail("机器已激活");
         }
+        //提现模式商户无需冲算法费
+        MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(deviceIds.get(0))).getData();
+        if (Emptys.check(merc.getIsDraw()) && merc.getIsDraw()) {
+            active.setIsDeviceAlgorithmCharging(false);
+        }
         //检查费用
         deviceIds.forEach(deviceId -> {
             R deviceChargingCheck = active.getIsDeviceCharging() ? deviceChargingService.check(new DeviceChargingDto.Check().setDeviceId(deviceId)) : R.ok();