user/role/tright 5.21

修改：邀请码的检查字段
修改：公司信息在注册页面第一页保存

src/main/java/com/pangding/web/authority/controller/MobileRegisterController.java

@@ -71,7 +71,7 @@ public class MobileRegisterController {
     public ResponseResult login(@RequestBody LoginReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("account or phone",reqVo.getAccountOrPhone())
-                .notBlankCheck("pass",reqVo.getPassword())
+                .notBlankCheck("password",reqVo.getPassword())
                 .checkException();
         registerServiceImpl.login(reqVo);
         return new ResponseResult();

src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java

@@ -2,15 +2,12 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.service.CompanyService;
-import com.pangding.web.authority.util.CompanyConstant;
-/*import com.pangding.web.authority.util.TokenUtil;*/
+import com.pangding.web.authority.util.TokenUtil;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.reqvo.CompanyGetReqVo;
 import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.UserService;
-/*import com.yanzuoguang.token.TokenHelper;*/
 import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -19,6 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/13 14:23
@@ -37,6 +37,8 @@ public class RegisterServiceImpl implements RegisterService {
     CompanyExtendDao companyExtendDaoImpl;
     @Autowired
     CompanyBankCardDao companyBankCardDaoImpl;
+    @Autowired
+    UserRoleDao userRoleDaoImpl;
 
     @Autowired
     private CompanyService companyService;
@@ -203,8 +205,26 @@ public class RegisterServiceImpl implements RegisterService {
         resVo.setCompanyVo(companyVo);
         resVo.setCompanyBankCardVo(companyBankCardVo);
         resVo.setCompanyExtendVo(companyExtendVo);
+
+        UserRoleGetReqVo reqVo1 = new UserRoleGetReqVo();
+        reqVo1.setUserId(userVo.getId());
+        List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(reqVo1,UserRoleVo.class);
+        List<RoleVo> roleVoList = new ArrayList();
+        if (userRoleVoList != null && !userRoleVoList.isEmpty()){
+            List<String> roleIds = new ArrayList();
+            for (UserRoleVo userRoleVo:userRoleVoList) {
+                roleIds.add(userRoleVo.getRoleId());
+            }
+            for (String roleId:roleIds) {
+                RoleGetReqVo reqVo2 = new RoleGetReqVo();
+                RoleVo roleVo = userRoleDaoImpl.load(reqVo2,RoleVo.class);
+                roleVoList.add(roleVo);
+            }
+        }
+
+        resVo.setRoleVoList(roleVoList);
 //        此处需要获取对应的merchant表数据
-        /*String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
-        TokenHelper.write(token,resVo);*/
+        String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
+        TokenHelper.write(token,resVo);
     }
 }

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -44,6 +44,10 @@ public class UserServiceImpl implements UserService {
 
         UserVo userVo = webUserReqVo;
         userDao.create(userVo);
+        saveUserRole(webUserReqVo);
+    }
+
+    private void saveUserRole(WebUserReqVo webUserReqVo){
         if (webUserReqVo.getRoleIds()!=null && !webUserReqVo.getRoleIds().isEmpty()){
             List<String> roleIds = webUserReqVo.getRoleIds();
             for (String roleId : roleIds) {
@@ -83,16 +87,7 @@ public class UserServiceImpl implements UserService {
                 }
             }
         }
-        if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().isEmpty()){
-            List<String> roleIds = webUserReqVo.getRoleIds();
-            for (String roleId : roleIds) {
-                UserRoleVo userRoleRelation = new UserRoleVo();
-                userRoleRelation.setRoleId(roleId);
-                userRoleRelation.setUserId(webUserReqVo.getId());
-                userRoleRelation.setId(StringHelper.getNewID());
-                userRoleDao.create(userRoleRelation);
-            }
-        }
+        saveUserRole(webUserReqVo);
     }
 
     @Override

src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java

@@ -2,6 +2,8 @@ package com.pangding.web.authority.vo.cloudvo;
 
 import com.pangding.web.authority.vo.*;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/16 17:50
@@ -15,6 +17,16 @@ public class LoginResVo {
 
     CompanyExtendVo companyExtendVo;
 
+    List<RoleVo> roleVoList;
+
+    public List<RoleVo> getRoleVoList() {
+        return roleVoList;
+    }
+
+    public void setRoleVoList(List<RoleVo> roleVoList) {
+        this.roleVoList = roleVoList;
+    }
+
     public CompanyExtendVo getCompanyExtendVo() {
         return companyExtendVo;
     }