1. 新合伙人团队分销 默认分销比例设置

src/main/java/com/ydtech/modules/admin/model/SysDept.java

@@ -133,6 +133,10 @@ public class SysDept implements Serializable {
     @ApiModelProperty(value = "机构来源(渠道、个代)")
     private String managementSource;
 
+    @TableField(value = "is_partner")
+    @ApiModelProperty(value = "是否是新合伙人团队")
+    private String isPartner;
+
     @TableField(exist = false)
     private List<SysDept> children;
 

src/main/java/com/ydtech/modules/admin/model/po/InsDeptDistributionProportion.java

@@ -12,6 +12,8 @@ public class InsDeptDistributionProportion {
 
     private String id;
 
+    private String type;
+
     private Integer level;
 
     private BigDecimal proportion;

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

@@ -310,7 +310,20 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
         //如果是团队并且个代  初始化分销比例
         if ("D".equals(sysDeptVo.getDeptType()) && "2".equals(sysDept.getManagementSource())) {
-            List<InsDeptDistributionProportion> insDeptDistributionProportions = insDeptDistributionProportionMapper.selectList(new LambdaQueryWrapper<>());
+            List<InsDeptDistributionProportion> insDeptDistributionProportions;
+            // 判断是否是新合伙人分销比例
+            if (Objects.isNull(sysDept.getIsPartner())){
+                // 如果是空默认为旧合伙人
+                sysDept.setIsPartner("0");
+            }
+            if (sysDept.getIsPartner().equals("1")){
+                insDeptDistributionProportions = insDeptDistributionProportionMapper.selectList(new LambdaQueryWrapper<InsDeptDistributionProportion>()
+                        .eq(InsDeptDistributionProportion::getType,2));
+
+            }else{
+                insDeptDistributionProportions = insDeptDistributionProportionMapper.selectList(new LambdaQueryWrapper<InsDeptDistributionProportion>()
+                        .eq(InsDeptDistributionProportion::getType,1));
+            }
             BigDecimal oneProportion = new BigDecimal(0);
             BigDecimal twoProportion = new BigDecimal(0);
             BigDecimal threeProportion = new BigDecimal(0);