合伙人bug修改

src/main/java/com/ydtech/modules/partner/CalculateCommissionUtils.java

@@ -53,11 +53,8 @@ public class CalculateCommissionUtils {
         CommissionRulesVo rulesVo = commissionService.queryAll();
         if (rulesVo == null) return BigDecimal.ZERO;
         BigDecimal gl = ladderCommission(StringUtils.equals("3", grade) ? "2" : grade,
-                rulesVo.getAdministrator().getRulesRatioList(),
-                StringUtils.equals("3", grade) ? partnerUserMapper.queryReferrerId(userId) : userId,
-                rulesVo.getAdministrator());
-        BigDecimal hh = ladderCommission(grade,
-                rulesVo.getPartner().getRulesRatioList(), userId, rulesVo.getPartner());
+                rulesVo.getAdministrator().getRulesRatioList(), userId, rulesVo.getAdministrator());
+        BigDecimal hh = ladderCommission(grade, rulesVo.getPartner().getRulesRatioList(), userId, rulesVo.getPartner());
        // BigDecimal hh = ladderCommission(grade, rulesVo.getPartner().getRulesRatioList(), userId, rulesVo.getPartner());
         if (StringUtils.equals("1", grade)) {
             return new BigDecimal(rulesVo.getOriginator());
@@ -144,12 +141,13 @@ public class CalculateCommissionUtils {
             if (CollectionUtil.isEmpty(ratioList)) continue;
 
             BigDecimal min = ratioList.get(0).getMin();
+            BigDecimal min1 = ratioList.get(1).getMin();
             if (allSatisfied == 1) {
-                if (numberBD.compareTo(min) >= 0 && sumPremium.compareTo(min) >= 0) {
+                if (numberBD.compareTo(min) >= 0 && sumPremium.compareTo(min1) >= 0) {
                     return ratio.getKickback();
                 }
             } else {
-                if (numberBD.compareTo(min) >= 0 || sumPremium.compareTo(min) >= 0) {
+                if (numberBD.compareTo(min) >= 0 || sumPremium.compareTo(min1) >= 0) {
                     return ratio.getKickback();
                 }
             }

src/main/java/com/ydtech/modules/partner/dao/PartnerPremiumDetailsMapper.java

@@ -17,7 +17,7 @@ public interface PartnerPremiumDetailsMapper extends BaseMapper<PartnerPremiumDe
 
 
 
-    @Select("SELECT SUM(sumpremium) FROM partner_premium_details ${ew.customSqlSegment} ")
+    @Select("SELECT SUM(DISTINCT sumpremium) FROM partner_premium_details ${ew.customSqlSegment} ")
     BigDecimal selectTotalSumPremium(@Param("ew") QueryWrapper<PartnerPremiumDetails> queryWrapper);