流量卡费用返现

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

@@ -18,6 +18,8 @@ import com.xy.config.FileConfig;
 import com.xy.device.EnumDeviceChargingHistoryStatus;
 import com.xy.device.EnumSimConfig;
 import com.xy.dto.DeviceSimDto;
+import com.xy.dto.MercFeeConfigAlgorithmTypeDto;
+import com.xy.dto.MercFeeConfigSimCardDto;
 import com.xy.entity.DeviceSim;
 import com.xy.entity.DeviceSimCharge;
 import com.xy.entity.SysDictRedis;
@@ -72,6 +74,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     private HttpServletResponse response;
 
     private FileConfig fileConfig;
+    private MercFeeConfigSimCardServiceImpl mercFeeConfigSimCardService;
 
 
     @PostMapping("countWaitHandle")
@@ -164,8 +167,12 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         IPage<DeviceSimDto.PageVo> iPage = baseMapper.page(toIPage(page.getPage()), page);
         List<DeviceSimDto.PageVo> records = iPage.getRecords();
         if (Emptys.check(records)) {
-            String name = simConfig.get(EnumSimConfig.name.getCode()).getValue();
-            Integer money = Integer.valueOf(simConfig.get(EnumSimConfig.money.getCode()).getValue());
+//            String name = simConfig.get(EnumSimConfig.name.getCode()).getValue();
+//            Integer money = Integer.valueOf(simConfig.get(EnumSimConfig.money.getCode()).getValue());
+            List<MercFeeConfigSimCardDto.DeviceSimPayVO> deviceSimPayVOS = R.feignCheckData(mercFeeConfigSimCardService.paySimCardFee(new MercFeeConfigAlgorithmTypeDto.SimPayQueryDTO().setMercId(page.getMercId())));
+            MercFeeConfigSimCardDto.DeviceSimPayVO deviceSimPayVO = deviceSimPayVOS.get(0);
+            String name = deviceSimPayVO.getName();
+            Integer money = deviceSimPayVO.getMoney();
             records.forEach(record -> {
                 //封装过期状态说明
                 DeviceSimDto.Vo sim = record.getSim();
@@ -194,12 +201,16 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     @PostMapping("pageByNotInit")
     @ApiOperation("未初始化分页查询")
     public R<PageBean<DeviceSimDto.PageVo>> pageByNotInit(@RequestBody DeviceSimDto.Page page) {
-        Map<String, SysDictRedis> simConfig = SysDictUtils.get(EnumSimConfig.Code.CODE.getCode());
+//        Map<String, SysDictRedis> simConfig = SysDictUtils.get(EnumSimConfig.Code.CODE.getCode());
         IPage<DeviceSimDto.PageVo> iPage = baseMapper.page2(toIPage(page.getPage()), page);
         List<DeviceSimDto.PageVo> records = iPage.getRecords();
         if (Emptys.check(records)) {
-            String name = simConfig.get(EnumSimConfig.name.getCode()).getValue();
-            Integer money = Integer.valueOf(simConfig.get(EnumSimConfig.money.getCode()).getValue());
+//            String name = simConfig.get(EnumSimConfig.name.getCode()).getValue();
+//            Integer money = Integer.valueOf(simConfig.get(EnumSimConfig.money.getCode()).getValue());
+            List<MercFeeConfigSimCardDto.DeviceSimPayVO> deviceSimPayVOS = R.feignCheckData(mercFeeConfigSimCardService.paySimCardFee(new MercFeeConfigAlgorithmTypeDto.SimPayQueryDTO().setMercId(page.getMercId())));
+            MercFeeConfigSimCardDto.DeviceSimPayVO deviceSimPayVO = deviceSimPayVOS.get(0);
+            String name = deviceSimPayVO.getName();
+            Integer money = deviceSimPayVO.getMoney();
             records.forEach(record -> {
                 //封装计费标准
                 record.setChargingName(name).setChargingMoney(money);

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

@@ -40,8 +40,10 @@ public class MercFeeConfigAlgorithmTypeDto {
 
     @Data
     @Accessors(chain = true)
-    public static class SimPayQueryDTO extends Vo {
-
+    public static class SimPayQueryDTO {
+        @NotNull(message = "商户id不能为空")
+        @ApiModelProperty(value = "商户id")
+        private Long mercId;
     }
 
     @Data