代理人3.0app开发

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

@@ -221,7 +221,7 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
 
 
     private VerifyData extractCommonLogic(String userId, String grade) {
-        PartnerRuleEntity partnerRuleEntity = validateGradeAndFetchRuleEntity(StringUtils.equals("4",grade) ? String.valueOf(Integer.valueOf(grade) +1) :grade);
+        PartnerRuleEntity partnerRuleEntity = validateGradeAndFetchRuleEntity(grade);
         if (partnerRuleEntity == null) {
             throw new SystemException("合作伙伴规则实体不能为空");
         }

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

@@ -76,9 +76,6 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     @Autowired
     private PartnerCommissionService commissionService;
 
-    @Autowired
-    private PartnerRuleService partnerRuleService;
-
     @Autowired
     private SysPartnerAccountMapper sysPartnerAccountMapper;
 
@@ -173,41 +170,21 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
 
 
-    public boolean verifyUpgradeConditions(String userId, String grade) {
-
-        QueryWrapper<PartnerUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",userId);
-        queryWrapper.eq("grade",grade);
-        Long count = baseMapper.selectCount(queryWrapper);
-        QueryWrapper<PartnerLiftingRecord> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id",userId);
-        wrapper.eq("audit_status",0);
-        Long aLong = liftingRecordMapper.selectCount(wrapper);
-
-        if (count > 0 || aLong > 0){
-            return false;
-        }
-        if (ruleService.verifyUpgradeConditions(userId,grade)){
-            return true;
-        }
-        return false;
-    }
-
-
 
     @Override
     public HttpResult submitLiftingRecord(UserGradeParam userGradeParam) {
 
-        if (verifyUpgradeConditions(userGradeParam.getId(), userGradeParam.getGrade())){
+        boolean checked = ruleService.verifyUpgradeConditions(userGradeParam.getId(),String.valueOf(Integer.valueOf(userGradeParam.getGrade())  + 1 ));
+        if (!checked){
             return HttpResult.error("请先达成升级条件");
         }
 
         PartnerUser user = getUser(userGradeParam.getId(), userGradeParam.getGrade());
-        if (!user.isIdentityStatus()){
+        if (null != user && !user.isIdentityStatus()){
             return HttpResult.error("当前身份已解锁");
         }
         Integer lockGrade = baseMapper.selectMax(userGradeParam.getId());
-        if (lockGrade  >  Integer.valueOf(userGradeParam.getGrade())){
+        if (null != lockGrade && lockGrade  >  Integer.valueOf(userGradeParam.getGrade())){
             if (4 == lockGrade){
                 return HttpResult.error("请先解锁工作室");
             }else if (3 == lockGrade){
@@ -358,7 +335,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                         Long difference = calculateTimeDifference(partnerUser.getUserId(), partnerUser.getGrade());
                         overviewVo.setZeroDays(difference);
                         BigDecimal lockCommission = liftingRecordService.queryLockCommission(partnerUser.getUserId(), String.valueOf(partnerUser.getGrade()));
-                        PartnerRuleEntity rule = partnerRuleService.selectByGrade(overviewVo.getGrade());
+                        PartnerRuleEntity rule = ruleService.selectByGrade(overviewVo.getGrade());
                         if (null != lockCommission && null !=  rule.getFallAmount()){
                             overviewVo.setFallAmount(lockCommission.multiply(rule.getFallAmount().divide(new BigDecimal("100"))).setScale(2, RoundingMode.HALF_UP));
                         }else {
@@ -594,7 +571,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     public List<Map<String, String>> getUserGradeListMap(String userId) {
         QueryWrapper<PartnerUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
-        List<PartnerRuleEntity> ruleEntityList = partnerRuleService.queryAll();
+        List<PartnerRuleEntity> ruleEntityList = ruleService.queryAll();
         List<PartnerUser> partnerUsers = baseMapper.selectList(queryWrapper);
         List<Map<String,String>> list = new ArrayList<>();
         for (PartnerRuleEntity ruleEntity : ruleEntityList) {
@@ -911,7 +888,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                     map.put("data", getPage(page));
                     map.put("total", hashMap);
                     map.put("parentStatus", partnerUser.isIdentityStatus() ? "2" : "1");
-                    PartnerRuleEntity ruleEntity = partnerRuleService.selectByGrade(overviewVo.getGrade());
+                    PartnerRuleEntity ruleEntity = ruleService.selectByGrade(overviewVo.getGrade());
                     map.put("fallAmount",ruleEntity.getFallAmount());
                     getRule(overviewVo, partnerUser);
 
@@ -946,7 +923,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         if (grade != 4){
             grade = grade + 1;
         }
-        boolean checked = partnerRuleService.verifyUpgradeConditions(partnerUser.getUserId(),String.valueOf(grade));
+        boolean checked = ruleService.verifyUpgradeConditions(partnerUser.getUserId(),String.valueOf(grade));
         overviewVo.setUpgradeStatus(checked ? 1 : 0);
         Long count = liftingRecordService.selectDowngradeRecord(partnerUser.getUserId(), partnerUser.getGrade(),1);
         if (count > 0){