Merge branch 'master' of http://192.168.0.204/pd-new/pd-user

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

@@ -178,8 +178,6 @@ public class CompanyManagementController {
                 .notBlankCheck("email",reqVo.getEmail())
                 .notBlankCheck("phone",reqVo.getPhone())
                 .checkPhoneNo("phone",reqVo.getPhone())
-                .notBlankCheck("createId",reqVo.getCreateId())
-                .notBlankCheck("createName",reqVo.getCreateName())
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.saveUser(reqVo));

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

@@ -299,6 +299,11 @@ public class PangdingManagementController {
        return ResponseResult.result(companyServiceImpl.findCompanyDivideInfo(req));
     }
 
+    /**
+     * 审核公司
+     * @param reqVo
+     * @return
+     */
     @RequestMapping(value = "/examineConfig",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult examineConfig(@RequestBody ExamineConfigReqVo reqVo){
         companyServiceImpl.examineConfig(reqVo);

src/main/java/com/pangding/web/authority/dao/RoleDao.java

 package com.pangding.web.authority.dao;
 
+import com.pangding.web.authority.vo.reqvo.GetEmptyRolesReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
 import com.pangding.web.authority.vo.RoleVo;
@@ -47,4 +48,5 @@ public interface RoleDao extends BaseDao {
      */
     List<RoleVo> getChild(RoleGetReqVo roleGetReqVo);
 
+    List<RoleVo> getEmptyRoles(GetEmptyRolesReqVo getEmptyRolesReqVo);
 }

src/main/java/com/pangding/web/authority/dao/impl/RoleDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.RoleDao;
+import com.pangding.web.authority.vo.reqvo.GetEmptyRolesReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
 import com.pangding.web.authority.vo.RoleVo;
@@ -19,6 +20,7 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
 
     private static final String CHECK_NAME_EXIST = "CHECK_NAME_EXIST";
     private static final String SELECT = "SELECT";
+    private static final String GET_EMPTY_ROLES = "GET_EMPTY_ROLES";
 
     @Override
     protected void init() {
@@ -29,6 +31,7 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
         table.add(SELECT,"select * from pd_role where 1=1 ")
         .add("id","and pid = ?");
 
+        table.add(GET_EMPTY_ROLES,"select * from pd_role where company_id = ''");
     }
 
     @Override
@@ -50,4 +53,9 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
     public List<RoleVo> getChild(RoleGetReqVo roleGetReqVo) {
         return this.query(RoleVo.class,SELECT, roleGetReqVo);
     }
+
+    @Override
+    public List<RoleVo> getEmptyRoles(GetEmptyRolesReqVo getEmptyRolesReqVo) {
+        return this.query(RoleVo.class,GET_EMPTY_ROLES,getEmptyRolesReqVo);
+    }
 }

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -173,5 +173,10 @@ public interface CompanyService{
      */
     CompanyVo checkInvitationCode(CheckInvitationCodeReqVo reqVo);
 
+    /**
+     * 审核公司
+     * @param reqVo
+     * @return
+     */
     void examineConfig(ExamineConfigReqVo reqVo);
 }

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

@@ -58,6 +58,8 @@ public class CompanyServiceImpl implements CompanyService {
     private CompanyMsgDao companyMsgDao;
     @Autowired
     private CompanyDivideRuleDao companyDivideRuleDao;
+    @Autowired
+    private RoleDao roleDaoImpl;
 
     /**
      * 修改公司信息
@@ -101,8 +103,17 @@ public class CompanyServiceImpl implements CompanyService {
         userGetReqVo.setCompanyId(reqVo.getId());
         UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
         if (null != userVo) {
+            userVo.setPassword("");
+            userVo.setRemark("");
             resVo.setUserVo(userVo);
         }
+        /*获取没有公司id的角色数组*/
+        GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
+        List<RoleVo> roleVoList = roleDaoImpl.getEmptyRoles(getEmptyRolesReqVo);
+        if (null == roleVoList || roleVoList.isEmpty()){
+            throw new CodeException("暂无未分配的角色，请先创建角色");
+        }
+        resVo.setRoleVoList(roleVoList);
         return resVo;
     }
 
@@ -828,6 +839,11 @@ public class CompanyServiceImpl implements CompanyService {
         return companyDao.load(companyGetReqVo,CompanyVo.class);
     }
 
+    /**
+     * 审核公司
+     * @param reqVo
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void examineConfig(ExamineConfigReqVo reqVo) {
@@ -842,11 +858,25 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
         companyExtendGetReqVo.setId(reqVo.getCompanyId());
         CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class);
+        if (null == companyExtendVo){
+            companyExtendVo = new CompanyExtendVo();
+            companyExtendVo.setId(reqVo.getCompanyId());
+            companyExtendVo.setQrCode(DateHelper.getNow()
+                    .replace("-", "")
+                    .replace(":", "")
+                    .replace(" ", ""));
+            companyExtendVo.setWithdrawMoney(reqVo.getWithdrawMoney());
+            companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
+            companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
+            companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
+            companyExtendDaoImpl.create(companyExtendVo);
+        }else {
             companyExtendVo.setWithdrawMoney(reqVo.getWithdrawMoney());
             companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
             companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
             companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
             companyExtendDaoImpl.update(companyExtendVo);
+        }
         /*新增或更新pd_company_divide_rule表*/
         CompanyDivideRuleVo companyDivideRuleVo = new CompanyDivideRuleVo();
         ObjectHelper.writeWithFrom(companyDivideRuleVo,reqVo);
@@ -865,6 +895,19 @@ public class CompanyServiceImpl implements CompanyService {
             companyDivideRuleVo.setBonusExplain(companyDivideRuleResVo.getBonusExplain());
             companyDivideRuleDao.update(companyDivideRuleVo);
         }
+        /*更新角色表*/
+        RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
+        roleGetReqVo.setId(reqVo.getRoleId());
+        RoleVo roleVo = roleDaoImpl.load(roleGetReqVo,RoleVo.class);
+        roleVo.setCompanyId(reqVo.getCompanyId());
+        roleVo.setIsAdmin(1);
+        roleDaoImpl.update(roleVo);
+        /*保存用户角色关系*/
+        UserRoleVo userRoleVo = new UserRoleVo();
+        userRoleVo.setId(StringHelper.getNewID());
+        userRoleVo.setUserId(reqVo.getUserId());
+        userRoleVo.setRoleId(roleVo.getId());
+        userRoleDaoImpl.create(userRoleVo);
     }
 
 }

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

@@ -124,7 +124,8 @@ public class UserServiceImpl implements UserService {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setAccount(userVo.getAccount());
         UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
-        if (null != userVo1){
+        if ((null != userVo1 && null == userVo.getId()) ||
+                (null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
             throw new CodeException("用户名"+userVo.getAccount()+"已存在");
         }
     }
@@ -134,7 +135,8 @@ public class UserServiceImpl implements UserService {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setPhone(userVo.getPhone());
         UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
-        if (null != userVo1){
+        if ((null != userVo1 && null == userVo.getId()) ||
+                (null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
             throw new CodeException("手机号"+userVo.getPhone()+"已存在");
         }
     }

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

@@ -28,6 +28,16 @@ public class LoginResVo {
 
     private List<AuthorityListByLevelResVo> authorityListByLevel;
 
+    private Merchant merchant;
+
+    public Merchant getMerchant() {
+        return merchant;
+    }
+
+    public void setMerchant(Merchant merchant) {
+        this.merchant = merchant;
+    }
+
     public String getUrl() {
         return url;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankCardGetReqVo.java

@@ -13,6 +13,16 @@ public class CompanyBankCardGetReqVo {
 
     private Integer isDefault;
 
+    private String bankCardCode;
+
+    public String getBankCardCode() {
+        return bankCardCode;
+    }
+
+    public void setBankCardCode(String bankCardCode) {
+        this.bankCardCode = bankCardCode;
+    }
+
     public Integer getIsDefault() {
         return isDefault;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankReqVo.java

@@ -33,7 +33,7 @@ public class CompanyBankReqVo {
     /**
      * 类型 公司 个人
      */
-    private String type;
+    private Integer type;
 
     /**
      * 公司id
@@ -115,11 +115,11 @@ public class CompanyBankReqVo {
         this.bankCode = bankCode;
     }
 
-    public String getType() {
+    public Integer getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 

src/main/java/com/pangding/web/authority/vo/reqvo/ExamineConfigReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
+import com.pangding.web.authority.vo.RoleVo;
 import com.yanzuoguang.dao.TableAnnotation;
 
 /**
@@ -87,6 +88,32 @@ public class ExamineConfigReqVo {
      */
     private String examineFailedReason;
 
+    /**
+     * 给该用户分配的角色id
+     */
+    private String roleId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
     public Integer getExamineStatus() {
         return examineStatus;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/GetEmptyRolesReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/18 19:45
+ */
+public class GetEmptyRolesReqVo {
+}

src/main/java/com/pangding/web/authority/vo/resvo/CompanyResVo.java

@@ -19,6 +19,16 @@ public class CompanyResVo {
 
     private CompanyBankCardVo bankCardVo;
 
+    private List<RoleVo> roleVoList;
+
+    public List<RoleVo> getRoleVoList() {
+        return roleVoList;
+    }
+
+    public void setRoleVoList(List<RoleVo> roleVoList) {
+        this.roleVoList = roleVoList;
+    }
+
     public Merchant getMerchant() {
         return merchant;
     }

src/main/java/com/pangding/web/authority/vo/resvo/LoginCompanyResVo.java

 package com.pangding.web.authority.vo.resvo;
 
+import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
 public class LoginCompanyResVo {
     private CompanyVo companyVo;
 
-    private List<String> bankCardCodeList;
+    private List<CompanyBankCardVo> bankCardVoList;
 
     public CompanyVo getCompanyVo() {
         return companyVo;
@@ -21,11 +22,11 @@ public class LoginCompanyResVo {
         this.companyVo = companyVo;
     }
 
-    public List<String> getBankCardCodeList() {
-        return bankCardCodeList;
+    public List<CompanyBankCardVo> getBankCardVoList() {
+        return bankCardVoList;
     }
 
-    public void setBankCardCodeList(List<String> bankCardCodeList) {
-        this.bankCardCodeList = bankCardCodeList;
+    public void setBankCardVoList(List<CompanyBankCardVo> bankCardVoList) {
+        this.bankCardVoList = bankCardVoList;
     }
 }