代理人3.0app开发

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

@@ -171,8 +171,37 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         return HttpResult.error("不满足升级条件");
     }
 
+
+
+    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())){
+            return HttpResult.error("请先达成升级条件");
+        }
+
         PartnerUser user = getUser(userGradeParam.getId(), userGradeParam.getGrade());
         if (!user.isIdentityStatus()){
             return HttpResult.error("当前身份已解锁");

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

@@ -17,13 +17,13 @@
                                 </if>
                        ),0) extractFee,
                 ifnull((
-                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 1
+                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 2
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>
                        ),0) expired,
                 ifnull((
-                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 2
+                           SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 1
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>