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

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

@@ -398,6 +398,10 @@ public class SysLoginController {
         String phone = phoneLoginVo.getPhone();
         String phoneMsg = phoneLoginVo.getPhoneMsg();
         SysUser user = sysUserService.findByPhone(phone);
+        if (user == null) {
+            //手机号不存在注册用户:上线测试团队
+            user = sysUserService.registerAPPUser(phone);
+        }
         //验证用户
         SysUser sysUser = sysUserService.getByUserId(user.getId());
         if ("2".equals(sysUser.getManagementSource())){
@@ -427,12 +431,12 @@ public class SysLoginController {
         if (StringUtils.isEmpty(phone)) {
             return HttpResult.error("手机号不能为空");
         }
-        if ("0".equals(type)) {  // 0 登录 1 注册
-            SysUser sysUser = sysUserService.findByPhone(phone);
-            if (sysUser == null) {
-                return HttpResult.error("手机号不存在！");
-            }
-        }
+//        if ("0".equals(type)) {  // 0 登录 1 注册
+//            SysUser sysUser = sysUserService.findByPhone(phone);
+//            if (sysUser == null) {
+//                return HttpResult.error("手机号不存在！");
+//            }
+//        }
 
         Random rand = new Random();
         // randNumber 将被赋值为一个 MIN 和 MAX 范围内的随机数

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -126,6 +126,7 @@ public interface SysUserService extends BaseIService<SysUser> {
     boolean saveUser(SysUser sysUser);
 
     HttpResult saveUserInfo(SysUser2Vo sysUserVo);
+    SysUser saveUserJzgInfo(SysUser2Vo sysUserVo);
 
     HttpResult saveUserInfoByPartner(SysUser2Vo sysUserVo);
 
@@ -345,6 +346,7 @@ public interface SysUserService extends BaseIService<SysUser> {
 
     List<SysUser> findNextTreeContain(String managementSource);
 
+    SysUser registerAPPUser(String phone);
 }
 
 

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

@@ -144,6 +144,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Value("${httpUrl}")
     private String httpUrl;
+    //晋掌柜APP: 未注册的手机号登录时创建新账户使用 -deptId -referrerId
+    @Value("${jzg.deptId}")
+    private String deptId;
+
+    @Value("${jzg.referrerId}")
+    private String referrerId;
+
+
 
     @Override
     public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
@@ -160,15 +168,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUserBaseVO> records = userList.getRecords();
         if (!CollectionUtils.isEmpty(records)) {
             for (SysUserBaseVO record : records) {
-                //合伙人APP邀请团队长查询推介人
-//                if (record.getType() != 0) {
-//                    String referrerId = record.getReferrerId();
-//                    if (StringUtils.isNotEmpty(referrerId)) {
-//                        record.setReferrerId(referrerId);
-//                        SysUser sysUser = sysUserMapper.selectById(record.getReferrerId());
-//                        record.setReferrerName(sysUser.getName());
-//                    }
-//                }
                 // 查询推荐人
                 EsmUserReferrer referrer = esmUserReferrerService.getById(record.getUserId());
                 if (ObjectUtils.isEmpty(referrer)) {
@@ -915,6 +914,45 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return HttpResult.ok("新增成功");
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SysUser saveUserJzgInfo(SysUser2Vo sysUserVo) {
+        SysUser sysUser = sysUserVo.getSysUser();
+        //处理密码
+        if (StringUtils.isNotEmpty(sysUser.getPassword())) {
+            String salt = PasswordUtils.getSalt();
+            String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
+            sysUser.setPassword(pwd);
+            sysUser.setSalt(salt);
+        } else {
+            throw new SystemException("密码不能为空");
+        }
+        String userId = gainNextUserId(sysUser.getDeptId());
+
+        sysUser.setId(userId);
+        save(sysUser);
+
+        //角色配置
+        SysUserRole userRole = new SysUserRole();
+        userRole.setUserId(sysUser.getId());
+        userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+        sysUserRoleService.save(userRole);
+        if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
+            //推荐人
+            esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
+        } else if ("20".equals(sysUser.getRoleId()) || "21".equals(sysUser.getRoleId())) {
+            //如果是 团队长或代理人 并且没有推荐人 则默认推荐人为自己
+            esmUserReferrerService.addReferrer(sysUser.getId(), userId);
+        }
+        SysUserInfo userInfo = sysUserVo.getSysUserInfo();
+        userInfo.setId(sysUser.getId());
+        sysUserInfoService.save(userInfo);
+
+        SysUser sysUser1 = sysUserMapper.selectById(sysUser.getReferrerId());
+        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, sysUser1.getName());
+        return sysUserMapper.selectById(userId);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult saveUserInfoByPartner(SysUser2Vo sysUserVo) {
@@ -2835,9 +2873,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     }
 
+    @Override
+    public SysUser registerAPPUser(String phone) {
+
+        SysUser2Vo sysUser2Vo = new SysUser2Vo();
+        SysUser sysUser = new SysUser();
+        SysUserInfo sysUserInfo = new SysUserInfo();
+        sysUser.setMobile(phone);
+        sysUser.setReferrerId(referrerId);
+        sysUser.setDeptId(deptId);
+        sysUser.setStatus(2);
+        sysUser.setPassword("123456");
+        sysUser.setRoleId("20");
+        sysUser.setRoleName("代理人");
+        sysUser.setName("新增用户"+phone);
+        sysUser2Vo.setSysUser(sysUser);
+        sysUserInfo.setSex("U");
+        sysUser2Vo.setSysUserInfo(sysUserInfo);
+
+        return this.saveUserJzgInfo(sysUser2Vo);
+
+    }
+
     /**
      * 拼接机构来源
-     * @param users
+     * @param user
      */
     private void appendName(SysUser user) {
         StringBuilder stringBuilder = new StringBuilder();

src/main/resources/application-pre.yml

@@ -457,4 +457,8 @@ ttqf:
   tokenUrl: https://test.baoxianzhanggui.com/web-api
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api
+#晋掌柜APP  手机注册用户 机构id  推荐人id
+jzg:
+  deptId: "99140121M09D01"
+  referrerId: "99140121M09D01001"

src/main/resources/application-prod.yml

@@ -463,3 +463,7 @@ ttqf:
 
 #灵活用工平台实时推送ip地址
 sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api
+#晋掌柜APP  手机注册用户 机构id  推荐人id
+jzg:
+  deptId: "99140121M09D01"
+  referrerId: "99140121M09D01001"

src/main/resources/application-test.yml

@@ -540,3 +540,7 @@ httpUrl: https://test.baoxianzhanggui.com/copartnerH5/#/pages/index/result?
 
 #灵活用工平台实时推送ip地址
 sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api
+#晋掌柜APP  手机注册用户 机构id  推荐人id
+jzg:
+  deptId: "99140121M09D01"
+  referrerId: "99140121M09D01001"