Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -321,17 +321,21 @@ public class SysLoginController {
         // 用户信息
         String phone = phoneLoginVo.getPhone();
         String phoneMsg = phoneLoginVo.getPhoneMsg();
-        SysUser user = sysUserService.findByPhone(phone);
+        SysUser partUser = sysUserService.findPartUserByPhone(phone);
+        SysUser user;
+        boolean isPartner = false;
+        if (Objects.isNull(partUser)){
+            user = sysUserService.findByPhone(phone);
+        }else {
+            isPartner = partnerUserService.selectByUserIdList(partUser.getId());
+            user = partUser;
+        }
         //验证用户
         SysUser.verifyUser(user);
         //校验登录用户是否为合伙人或者是机构负责人
         boolean a = sysPartnerService.checkPartner(user.getId());
         boolean b = sysAgencyLeaderService.checkUserId(user.getId());
-        SysUser partUser = sysUserService.findPartUserByPhone(phone);
-        boolean isPartner = false;
-        if (!Objects.isNull(partUser)){
-             isPartner = partnerUserService.selectByUserIdList(partUser.getId());
-        }
+
         if (a) {
             //类型：1.合伙人;2机构负责人
             aapLoginVo.setType(1);

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ import java.util.Date;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -1244,7 +1245,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             deptId = addDeptUser(sysUser,grade);
         }
         sysUser.setDeptId(deptId);
-
+        List<PartnerUser> partnerUserList = partnerUserService.selectRepeat(sysUserVo,grade);
+        if (CollectionUtil.isNotEmpty(partnerUserList)){
+            return HttpResult.error("注册身份已存在");
+        }
         //处理密码
         if (StringUtils.isNotEmpty(sysUser.getPassword())) {
             String salt = PasswordUtils.getSalt();
@@ -1321,7 +1325,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(StringUtils.isNotEmpty(phone), SysUser::getMobile, phone);
-        lqw.notLike(SysUser::getId, "%M%");
+        lqw.notLike(SysUser::getId, "M");
         List<SysUser> lst = list(lqw);
         if (lst.size() > 0) {
             sysUser = lst.get(0);

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

@@ -22,6 +22,7 @@ import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.SysPartnerAccount;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.AppUserInfoVo;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.admin.service.impl.SysUserServiceImpl;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.dao.InsUploadFilesMapper;
@@ -594,6 +595,16 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         return HttpResult.ok(jsonObject);
     }
 
+    @Override
+    public List<PartnerUser> selectRepeat(SysUser2Vo sysUserVo,String grade) {
+        LambdaQueryWrapper<PartnerUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PartnerUser::getReferrerId,sysUserVo.getSysUser().getReferrerId());
+        queryWrapper.eq(PartnerUser::getMobile,sysUserVo.getSysUser().getMobile());
+        queryWrapper.eq(PartnerUser::getGrade,grade);
+        List<PartnerUser> partnerUsers = baseMapper.selectList(queryWrapper);
+        return partnerUsers;
+    }
+
 
     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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysPartnerAccount;
 import com.ydtech.modules.admin.model.vo.AppUserInfoVo;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.partner.model.PartnerPartnerAccount;
 import com.ydtech.modules.partner.model.PartnerUser;
 import com.ydtech.modules.partner.model.param.AppHomeParams;
@@ -88,4 +89,6 @@ public interface PartnerUserService extends IService<PartnerUser> {
     List<Map<String,String>> getUserGradeListMap(String userId);
 
     HttpResult commissionRate(String userId, String grade);
+
+    List<PartnerUser> selectRepeat(SysUser2Vo sysUserVo,String grade);
 }