Parcourir la source

代理人app开发

xuqiang il y a 1 an
Parent
commit
e3f2ddc6d6

+ 1 - 1
src/main/java/com/ydtech/modules/partner/dao/PartnerAttributeMapper.java

@@ -19,7 +19,7 @@ public interface PartnerAttributeMapper extends BaseMapper<PartnerAttribute> {
     PartnerRuleEntity selectByGrade(String grade);
 
 
-    @Select("select grade,grade_name gradeName from partner_rule GROUP BY grade,grade_name\n")
+    @Select("select grade,grade_name gradeName from partner_rule WHERE grade != 5 GROUP BY grade,grade_name ")
     List<Map<String,String>> queryGradeName();
 
 }

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

@@ -386,7 +386,7 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
 
     @Override
     public List<PartnerRule> selectAll() {
-        return baseMapper.selectList(new LambdaQueryWrapper<>(PartnerRule.class).orderByAsc(PartnerRule::getGrade));
+        return baseMapper.selectList(new LambdaQueryWrapper<>(PartnerRule.class).notIn(PartnerRule::getGrade,5).orderByAsc(PartnerRule::getGrade));
     }
 
 

+ 2 - 8
src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -532,12 +532,9 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
             level.setZeroDays("99");
         }
         Integer grade = partnerUser.getGrade();
-        if (grade != 4){
-            grade = grade + 1;
-        }
         // 检查升级条件
         boolean verified = ruleService.verifyUpgradeConditions(
-                partnerUser.getUserId(), String.valueOf(grade));
+                partnerUser.getUserId(), String.valueOf(grade + 1));
         level.setUpgrade(verified);
 
         // 检查降级记录
@@ -722,10 +719,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     private void getRule(TeamOverviewVo overviewVo, PartnerUser partnerUser) {
         Integer grade = partnerUser.getGrade();
-        if (grade != 4){
-            grade = grade + 1;
-        }
-        boolean checked = partnerRuleService.verifyUpgradeConditions(partnerUser.getUserId(),String.valueOf(grade));
+        boolean checked = partnerRuleService.verifyUpgradeConditions(partnerUser.getUserId(),String.valueOf( grade + 1));
         overviewVo.setUpgradeStatus(checked ? 1 : 0);
         Long count = liftingRecordService.selectDowngradeRecord(partnerUser.getUserId(), partnerUser.getGrade(),1);
         if (count > 0){