设备算法计费完成

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

@@ -61,8 +61,8 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
                     .setOrderId(pay.getOrderId())
                     .setDeviceId(deviceAlgorithmCharging.getDeviceId())
                     .setAlgorithmId(deviceAlgorithmCharging.getAlgorithmId())
-                    .setChargingSize(pay.getChargingSize())
-                    .setChargingMoney(payType == give ? 0 : algorithmMoonConfig.getMoney() * pay.getChargingSize())
+                    .setChargingSize(deviceAlgorithmCharging.getChargingSize())
+                    .setChargingMoney(payType == give ? 0 : algorithmMoonConfig.getMoney() * deviceAlgorithmCharging.getChargingSize())
                     .setChargingType(pay.getPayType())
                     .setCreateTime(now)
                     .setUpdateTime(now);

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

@@ -37,10 +37,6 @@ public class DeviceAlgorithmChargingDto {
         @ApiModelProperty("计费信息")
         private List<DeviceAlgorithmCharging> deviceAlgorithmChargings;
 
-        @NotNull(message = "chargingSize不能为空")
-        @ApiModelProperty("充值数量")
-        private Integer chargingSize;
-
         @Data
         @Accessors(chain = true)
         public static class DeviceAlgorithmCharging {
@@ -51,6 +47,8 @@ public class DeviceAlgorithmChargingDto {
             @ApiModelProperty("算法id")
             private Long algorithmId;
 
+            @ApiModelProperty("充值数量")
+            private Integer chargingSize;
         }
     }