Merge branch 'test-xq2' into test

src/main/java/com/ydtech/modules/partner/controller/PartnerUserController.java

@@ -108,6 +108,14 @@ public class PartnerUserController extends BaseController {
         return partnerUserService.avatarUpdate(partnerUser);
     }
 
+    /**
+     * 我的佣金比例
+     * @return
+     */
+    @GetMapping("commissionRate")
+    public HttpResult commissionRate(@RequestParam("grade") String grade) {
+        return partnerUserService.commissionRate(getUserId(),grade);
+    }
 
 
     /**

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -35,10 +35,7 @@ import com.ydtech.modules.partner.service.PartnerCommissionService;
 import com.ydtech.modules.partner.service.PartnerLiftingRecordService;
 import com.ydtech.modules.partner.service.PartnerRuleService;
 import com.ydtech.modules.partner.service.PartnerUserService;
-import com.ydtech.modules.partner.utils.ConditionUtils;
-import com.ydtech.modules.partner.utils.ExpiredCommissionUtils;
-import com.ydtech.modules.partner.utils.PartnerDateUtils;
-import com.ydtech.modules.partner.utils.UnlockedStatusUtils;
+import com.ydtech.modules.partner.utils.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -587,6 +584,16 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         return list;
     }
 
+    @Override
+    public HttpResult commissionRate(String userId, String grade1) {
+        Map<Integer, PartnerUser> allByUserId = UpdateRatioUtils.getAllByUserId(userId);
+        BigDecimal mostRecent = CalculateCommissionUtils.calculateCommission(grade1, userId,allByUserId.get(3).getUserId(),allByUserId.get(4).getUserId());
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("rate",mostRecent);
+        jsonObject.put("description","");
+        return HttpResult.ok(jsonObject);
+    }
+
 
     private List<MyUserLevel> getUserLevels(String userId, List<PartnerRule> partnerRules, Map<Integer, PartnerUser> userMap) {
         List<MyUserLevel> list = new ArrayList<>();

src/main/java/com/ydtech/modules/partner/service/PartnerUserService.java

@@ -86,4 +86,6 @@ public interface PartnerUserService extends IService<PartnerUser> {
     HttpResult<PartnerPartnerAccount> getHomeWallet(AppHomeParams params);
 
     List<Map<String,String>> getUserGradeListMap(String userId);
+
+    HttpResult commissionRate(String userId, String grade);
 }

src/main/java/com/ydtech/modules/partner/utils/UpdateRatioUtils.java

@@ -87,7 +87,7 @@ public class UpdateRatioUtils {
     }
 
 
-    public  Map<Integer, PartnerUser> getAllByUserId(String userId) {
+    public static Map<Integer, PartnerUser> getAllByUserId(String userId) {
         Map<Integer, PartnerUser> map = new HashMap<>();
         List<PartnerUser> userList = partnerUserMapper.queryByUserId(userId);
         if (CollectionUtil.isNotEmpty(userList)) {