APP费用明细

src/main/java/com/ydtech/modules/admin/model/vo/SysPremiumDetailsVo.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class SysPremiumDetailsVo {
@@ -65,14 +64,14 @@ public class SysPremiumDetailsVo {
     @ApiModelProperty(value = "车牌号")
     private String licenseno;
 
+    @ApiModelProperty(value = "贡献合伙人等级")
+    private Integer profferLevel;
+
     /**
      * 存放贡献费用每集合伙人的等级和比例
      */
-    @ApiModelProperty(value = "费用来源和比例")
-    private List<Map<Integer,String>> proportionalList;
-
-    @ApiModelProperty(value = "费用来源和费用")
-    private List<Map<Integer,BigDecimal>> extractFeeList;
+    @ApiModelProperty(value = "费用来源和比例、费用")
+    private List<SysPremiumInfoVo> profferList;
 
 
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysPremiumInfoVo.java

@@ -0,0 +1,31 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SysPremiumInfoVo {
+
+    @ApiModelProperty(value = "费用来源(1，2,3,4,5级)")
+    private Integer source;
+
+    /**
+     * 抽层比例
+     */
+    @ApiModelProperty(value = "抽层比例")
+    private String proportional;
+
+    /**
+     * 佣金
+     */
+    @ApiModelProperty(value = "佣金")
+    private BigDecimal extractFee;
+
+    /**
+     * 总保费
+     */
+    @ApiModelProperty(value = "总保费")
+    private BigDecimal sumpremium;
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -1246,9 +1246,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     @Override
     public List<SysPremiumDetailsVo> getCommissionInfos(CommissionInfoDto commissionInfoDto) {
         List<SysPremiumDetailsVo> list = new ArrayList<>();
-
         String userId = BaseController.getUserId();
-
         List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
                 .eq(SysPremiumDetails::getUserId, userId)
                 .eq(commissionInfoDto.getIndustrySector() != 0, SysPremiumDetails::getIndustrySector, commissionInfoDto.getIndustrySector())
@@ -1260,16 +1258,28 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
                 .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
         for (String key : listMap.keySet()) {
-            List<Map<Integer,String>> proportionList = new ArrayList<>();
-            List<Map<Integer,BigDecimal>> extractFeeList = new ArrayList<>();
+            List<SysPremiumInfoVo> proportionList = new ArrayList<>();
             SysPremiumDetailsVo sysPremiumDetailsVo = new SysPremiumDetailsVo();
             sysPremiumDetailsVo.setCompanyId(key);
-
             List<SysPremiumDetails> detailsList = listMap.get(key);
 
             BigDecimal extractFee = detailsList.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
             sysPremiumDetailsVo.setExtractFee(extractFee);
             SysPremiumDetails sysPremiumDetails1 = detailsList.get(0);
+            String issuerId = sysPremiumDetails1.getIssuerId();
+            if (issuerId != null) {
+                SysUser sysUser1 = sysUserMapper.selectById(issuerId);
+                SysDept sysDept = sysDeptMapper.selectById(sysUser1.getDeptId());
+                SysAgencyLeader sysAgencyLeader = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
+                        .eq(SysAgencyLeader::getDelFlag, 1).eq(SysAgencyLeader::getDeptId, sysDept.getParentId()));
+                SysRelationPerson sysRelationPerson = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getAgencyLeaderId,sysAgencyLeader.getUserId())
+                        .eq(SysRelationPerson::getSource,0).eq(SysRelationPerson::getType,1));
+
+                SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
+                        .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysRelationPerson.getSuggestId()));
+                sysPremiumDetailsVo.setProfferLevel(sysPartner.getType());
+            }
             sysPremiumDetailsVo.setSumpremium(sysPremiumDetails1.getSumpremium());
             SysUser sysUser = sysUserMapper.selectById(sysPremiumDetails1.getIssuerId());
             sysPremiumDetailsVo.setIssuerName(sysUser.getName());
@@ -1280,18 +1290,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             sysPremiumDetailsVo.setStatus(sysPremiumDetails1.getStatus());
 
             for (SysPremiumDetails premiumDetails : detailsList) {
-                Map<Integer,String> proportionalMap = new LinkedHashMap<>();
-
-                Map<Integer,BigDecimal> extractFeeMap = new LinkedHashMap<>();
-
-                proportionalMap.put(premiumDetails.getSource(),premiumDetails.getProportional());
-                extractFeeMap.put(premiumDetails.getSource(),premiumDetails.getExtractFee());
-                proportionList.add(proportionalMap);
-                extractFeeList.add(extractFeeMap);
-
+                SysPremiumInfoVo sysPremiumInfoVo = new SysPremiumInfoVo();
+                sysPremiumInfoVo.setSource(premiumDetails.getSource());
+                sysPremiumInfoVo.setSumpremium(premiumDetails.getSumpremium());
+                sysPremiumInfoVo.setProportional(premiumDetails.getProportional());
+                sysPremiumInfoVo.setExtractFee(premiumDetails.getExtractFee());
+                proportionList.add(sysPremiumInfoVo);
             }
-            sysPremiumDetailsVo.setProportionalList(proportionList);
-            sysPremiumDetailsVo.setExtractFeeList(extractFeeList);
+            sysPremiumDetailsVo.setProfferList(proportionList);
 
             list.add(sysPremiumDetailsVo);
         }