#FIX NP

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

@@ -23,6 +23,7 @@ import com.xy.mapper.DeviceChargingHistoryMapper;
 import com.xy.service.be.MercService;
 import com.xy.util.ExcelUtils;
 import com.xy.utils.*;
+import com.xy.utils.enums.DeviceTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -98,6 +99,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
         return R.ok(pageBean);
     }
 
+
     public R<PageBean<DeviceChargingHistoryDto.PageVo>> pageByTopMerc(DeviceChargingHistoryDto.PageByTopMerc page) {
         Long curMercId = page.getCurMercId();
         Long chooseMercId = page.getChooseMercId();
@@ -108,8 +110,15 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             //指定商户ID
             mercIds.add(chooseMercId);
         }
-
-        DeviceChargingConfigDto.DeviceManagerFeeConfigVO deviceManagerFeeConfigVO = R.feignCheckData(deviceChargingConfigService.listByFeeConfig(new DeviceChargingConfigDto.ListByFeeConfigDTO().setMercId(curMercId)));
+        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()));
+        }
+        DeviceChargingConfigDto.DeviceManagerFeeConfigVO deviceManagerFeeConfigVO = R.feignCheckData(deviceChargingConfigService.listByFeeConfig(new DeviceChargingConfigDto.ListByFeeConfigDTO()
+                .setMercId(curMercId)
+                .setDeviceTypes(deviceTypeList)
+        ));
         List<DeviceChargingConfigDto.DeviceManagerFeeMercVO> dmFeeMercs = deviceManagerFeeConfigVO.getDmFeeMercs();
         Map<Integer, DeviceChargingConfigDto.DeviceManagerFeeMercVO> dfmMap = MapUtil.newHashMap();
         if (CollUtil.isNotEmpty(dmFeeMercs)) {