代理人3.0app开发

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

@@ -173,6 +173,10 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public HttpResult submitLiftingRecord(UserGradeParam userGradeParam) {
+        PartnerUser user = getUser(userGradeParam.getId(), userGradeParam.getGrade());
+        if (!user.isIdentityStatus()){
+            return HttpResult.error("当前身份已解锁");
+        }
         Integer lockGrade = baseMapper.selectMax(userGradeParam.getId());
         if (lockGrade  >  Integer.valueOf(userGradeParam.getGrade())){
             if (4 == lockGrade){
@@ -200,10 +204,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         if (aLong > 0){
             return HttpResult.error("重复提交，等待管理员审批");
         }
-        LambdaQueryWrapper<PartnerUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PartnerUser::getUserId,userGradeParam.getId());
-        lambdaQueryWrapper.eq(PartnerUser::getGrade,userGradeParam.getGrade());
-        PartnerUser partnerUser = baseMapper.selectOne(lambdaQueryWrapper);
+        PartnerUser partnerUser = getUser(userGradeParam.getId(),userGradeParam.getGrade());
         if (Objects.isNull(partnerUser)){
             return HttpResult.error("用户不存在");
         }
@@ -243,6 +244,13 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     }
 
 
+    public PartnerUser getUser(String userId,String grade){
+        LambdaQueryWrapper<PartnerUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PartnerUser::getUserId,userId);
+        lambdaQueryWrapper.eq(PartnerUser::getGrade,grade);
+        return baseMapper.selectOne(lambdaQueryWrapper);
+    }
+
     public String getMessage(PartnerRuleEntity ruleEntity){
         String message = "";
         PartnerAttribute entityCycle = ruleEntity.getCycle();
@@ -536,6 +544,10 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         if (StringUtils.isEmpty(params.getGrade())){
             return HttpResult.error("等级不能为空");
         }
+        if (params.getStartTime().length() < 10){
+            params.setStartTime(null);
+            params.setEndTime(null);
+        }
         LambdaQueryWrapper<PartnerPartnerAccount> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(PartnerPartnerAccount::getUserId,params.getUserId());
         lambdaQueryWrapper.eq(PartnerPartnerAccount::getGrade,params.getGrade());