合伙人bug修改

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

@@ -56,10 +56,9 @@ public class CalculateCommissionUtils {
                 rulesVo.getAdministrator().getRulesRatioList(),
                 StringUtils.equals("3", grade) ? partnerUserMapper.queryReferrerId(userId) : userId,
                 rulesVo.getAdministrator());
-        BigDecimal hh = ladderCommission(StringUtils.equals("4", grade) ? "3" : grade,
-                rulesVo.getPartner().getRulesRatioList(),
-                StringUtils.equals("4", grade) ? partnerUserMapper.queryReferrerId(userId) : userId,
-                rulesVo.getPartner());
+        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());
         }
@@ -132,6 +131,9 @@ public class CalculateCommissionUtils {
             case "3":
                 number = partnerUserMapper.selectNumber(userId, "5", period);
                 break;
+            case "4":
+                number = partnerUserMapper.selectByUserIdNumber(userId, "5", period);
+                break;
             default:
                 return BigDecimal.ZERO;
         }

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

@@ -107,4 +107,6 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
 
     @Update("UPDATE partner_user SET assessment_time = #{date} WHERE  user_id = #{userId} ")
     void updateAssessmentTimeByDate(@Param("userId") String userId,@Param("date") Date date);
+
+    Integer selectByUserIdNumber(@Param("userId") String userId,@Param("number")  String number, @Param("period") CommissionValidityPeriod period);
 }

src/main/resources/mapper/modules/partner/PartnerUserMapper.xml

@@ -817,4 +817,19 @@ select grade,grade_name from  partner_rule
              AND p.referrer_id IN ( SELECT user_id FROM partner_user WHERE referrer_id = #{userId} )
     </select>
 
+
+    <select id="selectByUserIdNumber" resultType="java.lang.Integer">
+        SELECT
+        COUNT( p.user_id )
+        FROM
+        partner_user p
+        LEFT JOIN sys_user_track t ON t.user_id = p.user_id
+        WHERE
+        t.`status` = 1 AND grade = #{number}
+        <if test="period.startDate != null and period.endDate != null">
+            AND t.approve_time BETWEEN #{period.startDate} AND #{period.endDate}
+        </if>
+        AND p.referrer_id = #{userId}
+    </select>
+
 </mapper>