|
@@ -54,6 +54,7 @@ import static com.xy.utils.PlusBeans.toPageBean;
|
|
|
public class MercFeeConfigSimCardServiceImpl extends ServiceImpl<MercFeeConfigSimCardMapper, MercFeeConfigSimCard> implements MercFeeConfigSimCardService {
|
|
|
|
|
|
private MercService mercService;
|
|
|
+ private DeviceAlgorithmChargingServiceImpl deviceAlgorithmChargingService;
|
|
|
|
|
|
@PostMapping("obj")
|
|
|
@ApiOperation("对象查询")
|
|
@@ -84,7 +85,7 @@ public class MercFeeConfigSimCardServiceImpl extends ServiceImpl<MercFeeConfigSi
|
|
|
}
|
|
|
|
|
|
@PostMapping("listByFeeConfig")
|
|
|
- @ApiOperation("设备算法费用配置查询")
|
|
|
+ @ApiOperation("流量卡费用配置查询")
|
|
|
public R<MercFeeConfigSimCardDto.DeviceSimConfigVO> listByFeeConfig(@RequestBody @Validated MercFeeConfigAlgorithmTypeDto.ListByFeeConfigDTO dto) {
|
|
|
MercFeeConfigSimCardDto.DeviceSimConfigVO data = new MercFeeConfigSimCardDto.DeviceSimConfigVO();
|
|
|
Long mercId = dto.getMercId();
|
|
@@ -118,6 +119,40 @@ public class MercFeeConfigSimCardServiceImpl extends ServiceImpl<MercFeeConfigSi
|
|
|
return R.ok(data);
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("paySimCardFee")
|
|
|
+ @ApiOperation("流量卡费用")
|
|
|
+ public R<List<MercFeeConfigSimCardDto.DeviceSimPayVO>> paySimCardFee(@RequestBody @Validated MercFeeConfigAlgorithmTypeDto.ListByFeeConfigDTO dto) {
|
|
|
+ Long mercId = dto.getMercId();
|
|
|
+ MercDto.Vo merc = R.feignCheckData(mercService.obj(new MercDto.Vo().setId(mercId)));
|
|
|
+ String mercCode = merc.getMercCode();
|
|
|
+ List<String> mercCodes = new ArrayList<>();
|
|
|
+ deviceAlgorithmChargingService.getMercCodes(mercCode, mercCodes);
|
|
|
+ //查询默认算法信息
|
|
|
+ //流量卡费-平台默认配置
|
|
|
+ Integer money = SysDictUtils.getValue(EnumSimConfig.Code.CODE.getCode(), EnumSimConfig.money.getCode(), Integer.class);
|
|
|
+ String name = SysDictUtils.getValue(EnumSimConfig.Code.CODE.getCode(), EnumSimConfig.name.getCode(), String.class);
|
|
|
+
|
|
|
+ // 设备管理费-商家自定义费用
|
|
|
+ List<MercFeeConfigSimCardDto.DeviceSimPayVO> deviceSimMercList = new ArrayList<>();
|
|
|
+ LambdaQueryWrapper<MercFeeConfigSimCard> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto, MercFeeConfigSimCard.class)
|
|
|
+ .in(MercFeeConfigSimCard::getMercCode, mercCodes)
|
|
|
+ .build();
|
|
|
+ List<MercFeeConfigSimCard> list = list(lambdaQueryWrapper);
|
|
|
+ if (CollUtil.isNotEmpty(list)) {
|
|
|
+ for (MercFeeConfigSimCard cfg : list) {
|
|
|
+ MercFeeConfigSimCardDto.DeviceSimPayVO deviceSimMercVO = BeanUtil.copyProperties(cfg, MercFeeConfigSimCardDto.DeviceSimPayVO.class);
|
|
|
+ deviceSimMercVO.setName(name).setMoney(money + cfg.getExtraMoney());
|
|
|
+ deviceSimMercList.add(deviceSimMercVO);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ MercFeeConfigSimCardDto.DeviceSimPayVO deviceSimMercVO = new MercFeeConfigSimCardDto.DeviceSimPayVO();
|
|
|
+ deviceSimMercVO.setName(name).setMoney(money);
|
|
|
+ deviceSimMercList.add(deviceSimMercVO);
|
|
|
+ }
|
|
|
+
|
|
|
+ return R.ok(deviceSimMercList);
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("save")
|
|
|
@ApiOperation("添加")
|
|
|
public R save(@RequestBody @Validated MercFeeConfigSimCardDto.Save save) {
|