设备管理费改版

device-api-service/src/main/java/com/xy/entity/DeviceCharging.java

@@ -33,9 +33,6 @@ public class DeviceCharging implements Serializable {
     @ApiModelProperty(value = "累计续费金额")
     private Integer chargingSumMoney;
 
-    @ApiModelProperty(value = "管理费剩余天数,权重最高")
-    private Integer chargingX;
-
     @ApiModelProperty(value = "过期时间")
     private LocalDateTime timeout;
 

device-api-service/src/main/java/com/xy/job/DeviceChargingJob.java

@@ -1,31 +0,0 @@
-package com.xy.job;
-
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import com.xy.mapper.DeviceChargingMapper;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 设备计费job
- */
-@Slf4j
-@Component
-@AllArgsConstructor
-public class DeviceChargingJob {
-
-    private DeviceChargingMapper deviceChargingMapper;
-
-    /**
-     * 扣除设备管理费剩余天数
-     *
-     * @return
-     */
-    @XxlJob("deviceChargingX")
-    public ReturnT<String> deviceChargingX() {
-        deviceChargingMapper.updateChargingX();
-        log.info("设备试用时间扣除完成~");
-        return ReturnT.SUCCESS;
-    }
-}

device-api-service/src/main/java/com/xy/mapper/DeviceChargingMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xy.dto.DeviceChargingDto;
 import com.xy.entity.DeviceCharging;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -17,14 +16,6 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface DeviceChargingMapper extends BaseMapper<DeviceCharging> {
 
-    /**
-     * 扣除设备服务费试用天数
-     *
-     * @return
-     */
-    @Select("update device_charging set charging_x = charging_x - 1 where charging_x > 0")
-    int updateChargingX();
-
     /**
      * 分页查询
      *

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

@@ -62,13 +62,14 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
     @PostMapping("init")
     @ApiOperation("初始化")
     public R init() {
+        String timeout = DataTime.getStringAround(0, 0, 365, 0, 0, 0);
         LocalDateTime localDateTime = LocalDateTime.now();
         List<DeviceInfo> list = deviceInfoService.list(new LambdaQueryWrapper<DeviceInfo>().eq(DeviceInfo::getActiveState, 1));
         List<DeviceCharging> deviceChargings = new ArrayList<>(list.size());
         for (DeviceInfo deviceInfo : list) {
             DeviceCharging deviceCharging = new DeviceCharging()
                     .setDeviceId(deviceInfo.getDeviceId())
-                    .setTimeout(localDateTime)
+                    .setTimeout(DataTime.toLocal(timeout))
                     .setCreateTime(localDateTime);
             deviceChargings.add(deviceCharging);
         }
@@ -158,16 +159,16 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
             int chargingX = Emptys.check(deviceChargingConfigs) ? deviceChargingConfigs.get(0).getConfigValue()
                     : SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode(), Integer.class);
             //新增
+            String timeout = DataTime.getStringAround(0, 0, chargingX, 0, 0, 0);
             deviceCharging = new DeviceCharging()
                     .setDeviceId(check.getDeviceId())
-                    .setTimeout(now)
-                    .setCreateTime(now)
-                    .setChargingX(chargingX);
+                    .setTimeout(DataTime.toLocal(timeout))
+                    .setCreateTime(now);
             save(deviceCharging);
         }
-        //验证管理费天数和过期时间
+        //验证过期时间
         int contrast = DataTime.stringContrast(DataTime.toString(deviceCharging.getTimeout()), DataTime.toString(now));
-        if (deviceCharging.getChargingX() == 0 && contrast <= 0) {
+        if (contrast <= 0) {
             return R.fail(R.Enum.CHARGING.getCode(), R.Enum.CHARGING.getMsg());
         }
         return R.ok();
@@ -278,18 +279,12 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
             boolean fal = false;
             //设备计费历史完成
             deviceChargingHistory.setStatus(status);
-            if (deviceChargingHistory.getChargingType() == 100) {
-                //赠送天数
-                deviceCharging.setChargingX(deviceCharging.getChargingX() + chargingSize);
+            String timeout = DataTime.getStringAround(chargingSize, 0, 0, 0, 0, 0, DataTime.toString(deviceCharging.getTimeout()));
+            deviceCharging.setChargingSumMoney(deviceCharging.getChargingSumMoney() + deviceChargingHistory.getChargingMoney())
+                    .setTimeout(DataTime.toLocal(timeout));
+            //过期时间大于当前时间
+            if (DataTime.stringContrast(timeout, DataTime.toString(now)) > 0) {
                 fal = true;
-            } else {
-                String timeout = DataTime.getStringAround(chargingSize, 0, 0, 0, 0, 0, DataTime.toString(deviceCharging.getTimeout()));
-                deviceCharging.setChargingSumMoney(deviceCharging.getChargingSumMoney() + deviceChargingHistory.getChargingMoney())
-                        .setTimeout(DataTime.toLocal(timeout));
-                //过期时间大于当前时间
-                if (DataTime.stringContrast(timeout, DataTime.toString(now)) > 0) {
-                    fal = true;
-                }
             }
             if (fal) {
                 //解冻设备

device-api/src/main/java/com/xy/dto/DeviceChargingDto.java

@@ -214,9 +214,6 @@ public class DeviceChargingDto {
         @ApiModelProperty(value = "累计续费金额")
         private Integer chargingSumMoney;
 
-        @ApiModelProperty(value = "管理费剩余天数,权重最高")
-        private Integer chargingX;
-
         @ApiModelProperty(value = "过期时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime timeout;