|
@@ -155,7 +155,8 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
|
|
return R.fail("机器已激活");
|
|
return R.fail("机器已激活");
|
|
}
|
|
}
|
|
//提现模式商户无需算法费
|
|
//提现模式商户无需算法费
|
|
- Boolean isDraw = mercService.isDraw(new MercDto.IsDraw().setMercId(deviceIds.get(0))).getData();
|
|
|
|
|
|
+ DeviceInfo deviceInfo = deviceInfoService.getById(deviceIds.get(0));
|
|
|
|
+ Boolean isDraw = mercService.isDraw(new MercDto.IsDraw().setMercId(deviceInfo.getMercId())).getData();
|
|
if (isDraw) {
|
|
if (isDraw) {
|
|
active.setIsDeviceAlgorithmCharging(false);
|
|
active.setIsDeviceAlgorithmCharging(false);
|
|
}
|
|
}
|