设备算法包月完成

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

@@ -46,23 +46,17 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
     @Override
     @ApiOperation("购买")
     public R pay(DeviceAlgorithmChargingDto.Pay pay) {
-        int give = 100;
         JList<DeviceAlgorithmChargingDto.Pay.DeviceAlgorithmCharging> deviceAlgorithmChargings = new JArrayList<>(pay.getDeviceAlgorithmChargings());
         LocalDateTime now = LocalDateTime.now();
-        //获取算法包月字典
-        Map<String, SysDictRedis> algorithmMoonConfigMaps = SysDictUtils.get(EnumAlgorithmMoonConfig.Code.CODE.getCode());
         List<DeviceAlgorithmChargingHistory> deviceAlgorithmChargingHistories = new ArrayList<>(deviceAlgorithmChargings.size());
         deviceAlgorithmChargings.forEach(deviceAlgorithmCharging -> {
-            SysDictRedis sysDictRedis = algorithmMoonConfigMaps.get(deviceAlgorithmCharging.getAlgorithmId().toString());
-            DeviceAlgorithmChargingDto.AlgorithmMoonConfig algorithmMoonConfig = JSONUtil.parseObj(sysDictRedis.getValue()).toBean(DeviceAlgorithmChargingDto.AlgorithmMoonConfig.class);
-            Integer payType = pay.getPayType();
             DeviceAlgorithmChargingHistory deviceAlgorithmChargingHistory = new DeviceAlgorithmChargingHistory()
                     .setId(YitIdHelper.nextId())
                     .setOrderId(pay.getOrderId())
                     .setDeviceId(deviceAlgorithmCharging.getDeviceId())
                     .setAlgorithmId(deviceAlgorithmCharging.getAlgorithmId())
                     .setChargingSize(deviceAlgorithmCharging.getChargingSize())
-                    .setChargingMoney(payType == give ? 0 : algorithmMoonConfig.getMoney() * deviceAlgorithmCharging.getChargingSize())
+                    .setChargingMoney(deviceAlgorithmCharging.getMoney())
                     .setChargingType(pay.getPayType())
                     .setCreateTime(now)
                     .setUpdateTime(now);