Merge branch 'master' into master-果昔项目

device-api-service/src/main/java/com/xy/service/DeviceAnnualFeeServiceImpl.java

@@ -86,6 +86,7 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
     @PostMapping("check")
     @ApiOperation("检查")
     public R<String> check(@RequestBody @Validated DeviceAnnualFeeDto.Check check) {
+        log.info("独立部署检查：{}，运行环境：{}", check.getDeviceId(), check.getRunPlatform());
         DeviceAnnualFee deviceAnnualFee = getOne(new LambdaQueryWrapper<DeviceAnnualFee>()
                 .eq(DeviceAnnualFee::getDeviceId, check.getDeviceId())
                 .eq(DeviceAnnualFee::getIsThis, true)
@@ -93,13 +94,13 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
         if (deviceAnnualFee == null) {
             return R.fail("设备未分配到年费商家");
         }
+        deviceAnnualFee.setRunPlatform(check.getRunPlatform());
+        updateById(deviceAnnualFee);
         String timeout = DataTime.toString(deviceAnnualFee.getTimeout());
         int i = DataTime.stringContrast(timeout, DataTime.getSring());
         if (i < 0) {
             return R.fail("已欠费");
         }
-        deviceAnnualFee.setRunPlatform(check.getRunPlatform());
-        updateById(deviceAnnualFee);
         return R.ok(timeout);
     }