Ver Fonte

购买反显-流量卡费用

tanbin há 1 ano atrás
pai
commit
4881f20ba1

+ 40 - 0
device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceSimPayController.java

@@ -0,0 +1,40 @@
+package com.xy.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceSimChargeDto;
+import com.xy.dto.DeviceSimDto;
+import com.xy.dto.MercFeeConfigAlgorithmTypeDto;
+import com.xy.dto.MercFeeConfigSimCardDto;
+import com.xy.service.DeviceSimChargeServiceImpl;
+import com.xy.service.DeviceSimServiceImpl;
+import com.xy.service.MercFeeConfigSimCardServiceImpl;
+import com.xy.utils.MercAuthUtils;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+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.List;
+
+@Service
+@AllArgsConstructor
+@Api(tags = "小程序-设备流量卡费用")
+@RestMappingController("merc-mini/deviceSimPay")
+public class DeviceSimPayController {
+
+    private MercFeeConfigSimCardServiceImpl mercFeeConfigSimCardService;
+
+
+    @PostMapping("query")
+    @ApiOperation("流量卡支付费用查询")
+    public R<List<MercFeeConfigSimCardDto.DeviceSimPayVO>> query(@RequestBody @Validated MercFeeConfigAlgorithmTypeDto.ListByFeeConfigDTO dto) {
+        dto.setMercId(MercAuthUtils.getMercId());
+        return mercFeeConfigSimCardService.paySimCardFee(dto);
+    }
+}

+ 1 - 0
device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -182,6 +182,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
         return R.ok(result);
     }
 
+
     @PostMapping("check")
     @ApiOperation("检查")
     public R check(@RequestBody @Validated DeviceChargingDto.Check check) {

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

@@ -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) {

+ 10 - 0
device-api/src/main/java/com/xy/dto/MercFeeConfigSimCardDto.java

@@ -91,6 +91,16 @@ public class MercFeeConfigSimCardDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class DeviceSimPayVO {
+        @ApiModelProperty(value = "名称")
+        private String name;
+        @ApiModelProperty(value = "年费,单位 分")
+        private Integer money;
+
+    }
+
 
     @Data
     @Accessors(chain = true)