Forráskód Böngészése

合伙人bug修改

xuqiang 1 éve
szülő
commit
b43917929d

+ 4 - 0
src/main/java/com/ydtech/modules/partner/CalculateCommissionUtils.java

@@ -73,6 +73,8 @@ public class CalculateCommissionUtils {
             } else if (isZero(gl)) {
                 return new BigDecimal(rulesVo.getPartner().getSharedRatio()).subtract(hh)
                         .add(subtractRatios(administrator.getSharedRatio(), administrator.getDefaultRatio()));
+            }else {
+                return new BigDecimal(rulesVo.getAdministrator().getSharedRatio()).subtract(gl);
             }
         }
         if (StringUtils.equals("3", grade)) {
@@ -87,6 +89,8 @@ public class CalculateCommissionUtils {
             } else if (isZero(gl)) {
                 return new BigDecimal(partner.getSharedRatio()).subtract(hh)
                         .add(subtractRatios(rulesVo.getAdministrator().getSharedRatio(), rulesVo.getAdministrator().getDefaultRatio()));
+            }else{
+                return gl.add(new BigDecimal(rulesVo.getPartner().getSharedRatio()).subtract(hh));
             }
         }
         if (StringUtils.equals("4", grade)) {

+ 1 - 1
src/main/resources/mapper/modules/partner/PartnerUserMapper.xml

@@ -261,7 +261,7 @@ select grade,grade_name from  partner_rule
                 partner_user
                 WHERE
                 grade = 4
-                AND to_days(create_time) = to_days(now())
+                AND to_days(create_time) = to_days(now()) and  referrer_id = #{params.userId}
                 ),0
             ) v3,
             ifnull((