加盟商-服务费管理-设备管理费

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

@@ -113,11 +113,10 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             //指定商户ID
             mercIds.add(chooseMercId);
         }
-        DeviceTypeEnum[] values = DeviceTypeEnum.values();
-        List<Integer> deviceTypeList = new ArrayList<>(values.length);
-        for (int i = 0; i < values.length; i++) {
-            deviceTypeList.add(Integer.valueOf(values[i].getCode()));
+        if (CollUtil.isEmpty(mercIds)) {
+            return R.ok();
         }
+        DeviceTypeEnum[] values = DeviceTypeEnum.values();
         List<MercFeeConfigDto.ListFeeConfigByMercVO> feeConfigByMercVOS = R.feignCheckData(mercFeeConfigService.listFeeConfigByMerc(new MercFeeConfigDto.ListFeeConfigByMercDTO().setMercId(curMercId)));
 
 
@@ -147,7 +146,6 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             List<DeviceInfoDto.Vo> deviceList = R.feignCheckData(deviceInfoService.listCommon(new DeviceInfoDto.ListCommon().setDeviceIds(deviceIds)));
             Map<Long, DeviceInfoDto.Vo> devcieMap = deviceList.stream().collect(Collectors.toMap(DeviceInfoDto.Vo::getDeviceId, d -> d));
             for (DeviceChargingHistoryDto.PageVo record : records) {
-                Long deviceId = record.getDeviceId();
                 Long mercId = record.getMercId();
                 //初始0 设备管理费佣金
                 record.setAgentMoney(0);