设备管理费改版

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

@@ -34,7 +34,7 @@ public class DeviceChargingConfig implements Serializable {
     private Integer deviceType;
 
     @ApiModelProperty(value = "赠送天数/预充金额")
-    private Integer values;
+    private Integer configValue;
 
     @ApiModelProperty(value = "类型")
     private Integer type;

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

@@ -54,33 +54,33 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
     public R saveOrUpdate(@RequestBody @Validated DeviceChargingConfigDto.SaveOrUpdate saveOrUpdate) {
         LocalDateTime now = LocalDateTime.now();
         MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(saveOrUpdate.getMercId())).getData();
-        List<DeviceChargingConfigDto.SaveOrUpdate.Values> values = saveOrUpdate.getValuesList();
-        for (DeviceChargingConfigDto.SaveOrUpdate.Values value : values) {
+        List<DeviceChargingConfigDto.SaveOrUpdate.ConfigValue> values = saveOrUpdate.getConfigValues();
+        for (DeviceChargingConfigDto.SaveOrUpdate.ConfigValue value : values) {
             LambdaQueryWrapper<DeviceChargingConfig> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceChargingConfig>()
                     .eq(DeviceChargingConfig::getMercCode, merc.getMercCode())
                     .eq(DeviceChargingConfig::getDeviceType, saveOrUpdate.getDeviceType())
                     .eq(DeviceChargingConfig::getType, value.getType());
             DeviceChargingConfig deviceChargingConfig = getOne(lambdaQueryWrapper);
             if (deviceChargingConfig == null) {
-                if (value.getValues() == -1) {
+                if (value.getConfigValue() == -1) {
                     continue;
                 }
                 deviceChargingConfig = new DeviceChargingConfig()
                         .setId(YitIdHelper.nextId())
                         .setMercCode(merc.getMercCode())
                         .setDeviceType(saveOrUpdate.getDeviceType())
-                        .setValues(value.getValues())
+                        .setConfigValue(value.getConfigValue())
                         .setNote(saveOrUpdate.getNote())
                         .setType(value.getType())
                         .setCreateTime(now)
                         .setUpdateTime(now);
                 save(deviceChargingConfig);
             } else {
-                if (value.getValues() == -1) {
+                if (value.getConfigValue() == -1) {
                     removeById(deviceChargingConfig.getId());
                     continue;
                 }
-                deviceChargingConfig.setValues(value.getValues())
+                deviceChargingConfig.setConfigValue(value.getConfigValue())
                         .setNote(saveOrUpdate.getNote())
                         .setUpdateTime(now);
                 updateById(deviceChargingConfig);

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

@@ -102,7 +102,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                 .orderByDesc(DeviceChargingConfig::getMercCode)
         );
         //有则使用，无则使用默认字典
-        int standard = Emptys.check(deviceChargingConfigs) ? deviceChargingConfigs.get(0).getValues()
+        int standard = Emptys.check(deviceChargingConfigs) ? deviceChargingConfigs.get(0).getConfigValue()
                 : SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), String.valueOf(deviceInfo.getDeviceType()), Integer.class);
         DeviceChargingDto.PayCheckVo.DeviceInfo deviceInfoObj = Beans.copy(Beans.copy(DeviceChargingDto.PayCheckVo.DeviceInfo.class, deviceInfo), deviceInfo.getDeviceStatus())
                 .setDeviceTypeName(deviceTypeName)
@@ -154,7 +154,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                     .orderByDesc(DeviceChargingConfig::getMercCode)
             );
             //有则使用，无则使用默认字典
-            int chargingX = Emptys.check(deviceChargingConfigs) ? deviceChargingConfigs.get(0).getValues()
+            int chargingX = Emptys.check(deviceChargingConfigs) ? deviceChargingConfigs.get(0).getConfigValue()
                     : SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode(), Integer.class);
             //新增
             deviceCharging = new DeviceCharging()

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

@@ -47,14 +47,14 @@ public class DeviceChargingConfigDto {
 
         @NotEmpty(message = "values不能为空")
         @ApiModelProperty(value = "参数值", required = true)
-        private List<Values> valuesList;
+        private List<ConfigValue> configValues;
 
         @ApiModelProperty(value = "备注")
         private String note;
 
         @Data
         @Accessors(chain = true)
-        public static class Values {
+        public static class ConfigValue {
 
             @NotNull(message = "type不能为空")
             @ApiModelProperty(value = "类型", required = true)
@@ -62,7 +62,7 @@ public class DeviceChargingConfigDto {
 
             @NotNull(message = "values不能为空")
             @ApiModelProperty(value = "赠送天数/预充金额", required = true)
-            private Integer values;
+            private Integer configValue;
         }
     }
 
@@ -80,7 +80,7 @@ public class DeviceChargingConfigDto {
         private Integer deviceType;
 
         @ApiModelProperty(value = "赠送天数/预充金额")
-        private Integer values;
+        private Integer configValue;
 
         @ApiModelProperty(value = "备注")
         private String note;