流量卡费续费佣金反显

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

@@ -2,38 +2,30 @@ package com.xy.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xy.device.EnumAlgorithmPayConfig;
-import com.xy.device.EnumAlgorithmTypes;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.device.EnumSimConfig;
-import com.xy.dto.*;
+import com.xy.dto.MercFeeConfigAlgorithmTypeDto;
+import com.xy.dto.MercFeeConfigDto;
+import com.xy.dto.MercFeeConfigSimCardDto;
 import com.xy.dto.be.MercDto;
-import com.xy.entity.MercFeeConfigAlgorithmType;
 import com.xy.entity.MercFeeConfigSimCard;
-import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.MercFeeConfigSimCardMapper;
-import com.xy.service.MercFeeConfigSimCardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.service.be.MercService;
 import com.xy.utils.*;
-import org.springframework.stereotype.Service;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.PostMapping;
-import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.validation.annotation.Validated;
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
@@ -55,6 +47,8 @@ public class MercFeeConfigSimCardServiceImpl extends ServiceImpl<MercFeeConfigSi
 
     private MercService mercService;
     private DeviceAlgorithmChargingServiceImpl deviceAlgorithmChargingService;
+    private MercFeeConfigService mercFeeConfigService;
+
 
     @PostMapping("obj")
     @ApiOperation("对象查询")
@@ -131,6 +125,8 @@ public class MercFeeConfigSimCardServiceImpl extends ServiceImpl<MercFeeConfigSi
         //流量卡费-平台默认配置
         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);
+        //佣金配置查询
+        MercFeeConfigDto.FeeConfigByMercVO mercFeeConfig = R.feignCheckData(mercFeeConfigService.getFeeConfigByMerc(new MercFeeConfigDto.FeeConfigByMerc().setMercCode(merc.getMercCode())));
 
         // 设备管理费-商家自定义费用
         List<MercFeeConfigSimCardDto.DeviceSimPayVO> deviceSimMercList = new ArrayList<>();
@@ -141,12 +137,12 @@ public class MercFeeConfigSimCardServiceImpl extends ServiceImpl<MercFeeConfigSi
         if (CollUtil.isNotEmpty(list)) {
             for (MercFeeConfigSimCard cfg : list) {
                 MercFeeConfigSimCardDto.DeviceSimPayVO deviceSimMercVO = BeanUtil.copyProperties(cfg, MercFeeConfigSimCardDto.DeviceSimPayVO.class);
-                deviceSimMercVO.setName(name).setMoney(money + cfg.getExtraMoney());
+                deviceSimMercVO.setName(name).setMoney(cfg.getExtraMoney() + mercFeeConfig.getFeeSimcard());
                 deviceSimMercList.add(deviceSimMercVO);
             }
         } else {
             MercFeeConfigSimCardDto.DeviceSimPayVO deviceSimMercVO = new MercFeeConfigSimCardDto.DeviceSimPayVO();
-            deviceSimMercVO.setName(name).setMoney(money);
+            deviceSimMercVO.setName(name).setMoney(money + mercFeeConfig.getFeeSimcard());
             deviceSimMercList.add(deviceSimMercVO);
         }