浏览代码

调用图灵业务,改成业务方实现

nelson 4 月之前
父节点
当前提交
010c07cb58

+ 1 - 3
sikey-hmd-business/sikey-hmd-business-biz/src/main/java/cn/sikey/hmd/api/DeviceActivationApiImpl.java

@@ -27,8 +27,6 @@ import java.util.Objects;
 @Validated
 public class DeviceActivationApiImpl implements DeviceActivationApi {
 
-    public static final Long RENEWAL_ONE_YEAR = 1L;
-
     @Resource
     private DeviceActivationService deviceActivationService;
 
@@ -43,7 +41,7 @@ public class DeviceActivationApiImpl implements DeviceActivationApi {
         }
 
         deviceActivationService.updateDeviceActivation(deviceId, queryDeviceActivation.getFreeExpireTime(),
-                queryDeviceActivation.getFinalExpireTime().plusYears(RENEWAL_ONE_YEAR),
+                queryDeviceActivation.getFinalExpireTime(),
                 LocalDateTime.now(), ValidityEnum.YEAR.getValue());
         return CommonResult.success();
     }

+ 1 - 1
sikey-hmd-business/sikey-hmd-business-biz/src/main/java/cn/sikey/hmd/service/activation/DeviceActivationServiceImpl.java

@@ -42,7 +42,7 @@ public class DeviceActivationServiceImpl implements DeviceActivationService {
                                        LocalDateTime now, int plansValidity) {
         // 最终时间
         LocalDateTime fExpireTime = DateToolUtil.calculateFinalExpireTime(freeExpireTime, finalExpireTime, now);
-        log.info("[更新设备激活]设备编码:{},普通用户到期时间:{},原最终到期时间:{}", deviceId, freeExpireTime, finalExpireTime);
+        log.info("[更新设备激活]设备编码:{},普通用户到期时间:{},原最终到期时间:{},当前时间:{}", deviceId, freeExpireTime, finalExpireTime, now);
         deviceActivationMapper.updateDeviceActivation(deviceId, fExpireTime, plansValidity);
         log.info("[更新设备激活]更新数据库成功,设备编码:{},普通用户到期时间:{},最终到期时间:{}", deviceId, freeExpireTime, fExpireTime);
     }