user/role/tright 6.10

还需要调用其他服务

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

@@ -4,9 +4,7 @@ import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
 import com.pangding.web.authority.vo.resvo.CompanyResVo;
-import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;

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

@@ -45,30 +45,39 @@ public class LoginController {
                 .notBlankCheck("account or phone",reqVo.getAccountOrPhone())
                 .notBlankCheck("password",reqVo.getPassword())
                 .checkException();
-        LoginResVo resVo = registerServiceImpl.login(reqVo);
-        ResponseResult result = new ResponseResult();
-        /*if (LoginConstant.PERSONAL_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
-            result.setCode("01");
+        return ResponseResult.result(registerServiceImpl.login(reqVo));
+        /*ResponseResult result = new ResponseResult();*//*
+        if (LoginConstant.PERSONAL_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
+            *//*result.setCode("00");
             result.setMessage("个人基本信息未完善，跳转个人完善页面");
-            result.setData(reqVo);
+            reqVo.setPassword("");
+            reqVo.setCode("01");
+            result.setData(reqVo);*//*
+            resVo.setCode();
             return result;
         }else if (LoginConstant.COMPANY_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
-            result.setCode("02");
+            result.setCode("00");
             result.setMessage("公司基本信息未完善，跳转公司完善页面");
+            reqVo.setPassword("");
+            reqVo.setCode("02");
             result.setData(reqVo);
             return result;
         }else if (LoginConstant.HAVE_NO_BANK_CARD.equals(resVo.getCode())){
-            result.setCode("03");
+            result.setCode("00");
             result.setMessage("还未添加银行卡，跳转添加银行卡页面");
+            reqVo.setPassword("");
+            reqVo.setCode("03");
             result.setData(reqVo);
             return result;
         }else if (LoginConstant.NOT_SIGNING.equals(resVo.getCode())){
-            result.setCode("04");
+            result.setCode("00");
             result.setMessage("未签约，跳转签约页面");
+            reqVo.setPassword("");
+            reqVo.setCode("04");
             result.setData(reqVo);
             return result;
         }*/
-        return ResponseResult.result(resVo);
+        /*return ResponseResult.result(resVo);*/
     }
 
     /*@RequestMapping(value = "/computer", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)

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

@@ -4,7 +4,6 @@ import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
 import com.pangding.web.authority.vo.resvo.CompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;

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

@@ -3,7 +3,6 @@ package com.pangding.web.authority.dao;
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
 import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
-import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
@@ -17,7 +16,7 @@ public interface CompanyBankCardDao extends BaseDao {
      * @param reqVo
      * @return
      */
-    PageSizeData<CompanyBankCardResVo> getBankCardList(BankCardListReqVo reqVo);
+    PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo);
 
     /**
      * 将指定银行卡设置为非默认

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

@@ -4,7 +4,6 @@ import com.pangding.web.authority.dao.CompanyBankCardDao;
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
 import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
-import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
@@ -36,8 +35,8 @@ public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCa
      * @return
      */
     @Override
-    public PageSizeData<CompanyBankCardResVo> getBankCardList(BankCardListReqVo reqVo) {
-        return this.queryPage(CompanyBankCardResVo.class,reqVo,GET_BANK_CARD_LIST,reqVo);
+    public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
+        return this.queryPage(CompanyBankCardVo.class,reqVo,GET_BANK_CARD_LIST,reqVo);
     }
 
     @Override

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

@@ -4,12 +4,9 @@ package com.pangding.web.authority.service;
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
 import com.pangding.web.authority.vo.resvo.CompanyResVo;
-import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
-import com.yanzuoguang.util.vo.ResponseResult;
 
 import java.util.List;
 

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

@@ -12,11 +12,8 @@ import com.pangding.web.authority.util.RoleConstant;
 import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
 import com.pangding.web.authority.vo.resvo.CompanyResVo;
-import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
-import com.pangding.web.constant.MerchantConstant;
 import com.pangding.web.util.RSAUtils;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -432,7 +429,7 @@ public class CompanyServiceImpl implements CompanyService{
         else{
             reqVo.setId(id);
             BankCardListReqVo reqVo1 = new BankCardListReqVo();
-            PageSizeData<CompanyBankCardResVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
+            PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
 
             /*若该银行卡是第一张银行卡，则设为默认*/
             if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()){
@@ -602,12 +599,12 @@ public class CompanyServiceImpl implements CompanyService{
      */
     @Override
     public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
-     return   companyBankCardDao.loadPage(reqVo,CompanyBankCardVo.class);
-   /*     PageSizeData<CompanyBankCardResVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardList(reqVo);
+
+        PageSizeData<CompanyBankCardVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardList(reqVo);
         if (companyBankCardVoPageSizeData == null || companyBankCardVoPageSizeData.getList().isEmpty()) {
             throw new CodeException("暂无银行卡，请先添加");
-        }*/
-//        return companyBankCardVoPageSizeData;
+        }
+        return companyBankCardVoPageSizeData;
     }
 
     /**

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

@@ -94,7 +94,11 @@ public class RegisterServiceImpl implements RegisterService {
         // 检查用户名是否存在
         userServiceImpl.checkAccount(userVo);
 
-        if (!StringHelper.compare( registerUserReqVo.getPassword(), registerUserReqVo.getConfirmPassword())){
+        /*通过私钥将rsa加密的密码解密*/
+        String password = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getPassword(),RsaConstant.privateKey);
+        String confirmPassword = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getConfirmPassword(),RsaConstant.privateKey);
+
+        if (!StringHelper.compare(password,confirmPassword)){
             throw new CodeException("确认密码错误");
         }
 
@@ -103,9 +107,6 @@ public class RegisterServiceImpl implements RegisterService {
             throw new CodeException("注册编码错误");
         }
 
-        /*通过私钥将rsa加密的密码解密*/
-        String password = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getPassword(), RsaConstant.privateKey);
-
         String companyId = StringHelper.getNewID();
         userVo.setPassword(StringHelper.md5(password));
         userVo.setId(StringHelper.getNewID());
@@ -340,29 +341,35 @@ public class RegisterServiceImpl implements RegisterService {
         TokenHelper.write(token,reqVo);
         LoginResVo resVo = new LoginResVo();
         resVo.setToken(token);
+        userVo.setPassword("");
+        userVo.setRemark("");
         resVo.setUserVo(userVo);
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(userVo.getCompanyId());
         CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
+        LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
+        loginCompanyResVo.setCompanyVo(companyVo);
+        resVo.setCompanyResVo(loginCompanyResVo);
+
         /*判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面*/
-        /*if (!companyVo.getStatus().equals(LoginConstant.FINISHED_BASIC_INFO) && CompanyConstant.COMPANY_TYPE_PERSON.equals(companyVo.getCompanyType())){
+        if (companyVo.getStatus()!=(LoginConstant.FINISHED_BASIC_INFO) && CompanyConstant.COMPANY_TYPE_PERSON==(companyVo.getCompanyType())){
             resVo.setCode("01");
+            resVo.setMsg("个人基本信息未完善，跳转个人完善页面");
             return resVo;
-        }*/
+        }
         /*判断基本信息是否完善，及状态是否为2，且为公司用户，若不完善则跳转个人完善页面*/
-        /*else if (!companyVo.getStatus().equals(LoginConstant.FINISHED_BASIC_INFO) && CompanyConstant.COMPANY_TYPE_COMPANY.equals(companyVo.getCompanyType())){
+        else if (companyVo.getStatus()!=(LoginConstant.FINISHED_BASIC_INFO) && (CompanyConstant.COMPANY_TYPE_COMPANY==(companyVo.getCompanyType()))){
             resVo.setCode("02");
+            resVo.setMsg("公司基本信息未完善，跳转公司完善页面");
             return resVo;
-        }*/
+        }
         /*判断电子签约状态，若不为10，则跳转签约页面*/
-        /*else if (!companyVo.getSigningStatus().equals(LoginConstant.HAVE_SIGNED)){
+        else if (companyVo.getSigningStatus() != (LoginConstant.HAVE_SIGNED)){
             resVo.setCode("04");
+            resVo.setMsg("未签约，跳转签约页面");
+            resVo.setUrl("TODO");
             return resVo;
-        }*/
-        LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
-        loginCompanyResVo.setId(companyVo.getId());
-        loginCompanyResVo.setStatus(companyVo.getStatus());
-        loginCompanyResVo.setCompanyAttribute(companyVo.getCompanyAttribute());
+        }
 
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         getReqVo.setCompanyId(companyVo.getId());
@@ -372,11 +379,12 @@ public class RegisterServiceImpl implements RegisterService {
             for (CompanyBankCardVo companyBankCardVo:companyBankCardVoList) {
                 bankCardCodeList.add(companyBankCardVo.getBankCardCode());
             }
-        }/*else{
-            *//*该公司没有银行卡，需要跳转添加银行卡*//*
+        }else{
+            /*该公司没有银行卡，需要跳转添加银行卡*/
             resVo.setCode("03");
+            resVo.setMsg("还未添加银行卡，跳转添加银行卡页面");
             return resVo;
-        }*/
+        }
         /*获取用户权限列表*/
         UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
         userRoleGetReqVo.setUserId(userVo.getId());
@@ -423,6 +431,7 @@ public class RegisterServiceImpl implements RegisterService {
         }
         loginCompanyResVo.setBankCardCodeList(bankCardCodeList);
         resVo.setCompanyResVo(loginCompanyResVo);
+        resVo.setCode("00");
         return resVo;
     }
 

src/main/java/com/pangding/web/authority/util/LoginConstant.java

@@ -5,6 +5,11 @@ package com.pangding.web.authority.util;
  * @create 2019/5/28 18:26
  */
 public class LoginConstant {
+    /**
+     * 登陆成功
+     */
+    public static final String SUCCESS = "00";
+
     /**
      * 个人基本信息为完善
      * 值："01"
@@ -33,11 +38,11 @@ public class LoginConstant {
      * 已完善基本信息
      * 值：2
      */
-    public static final String FINISHED_BASIC_INFO = "2";
+    public static final int FINISHED_BASIC_INFO = 2;
 
     /**
      * 已签约
      * 值：10
      */
-    public static final String HAVE_SIGNED = "10";
+    public static final int HAVE_SIGNED = 10;
 }

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

@@ -17,10 +17,33 @@ public class LoginResVo {
 
     private String code;
 
+    private String msg;
+
+    /**
+     * 电子签约地址
+     */
+    private String url;
+
     private LoginCompanyResVo companyResVo;
 
     private List<AuthorityListByLevelResVo> authorityListByLevel;
 
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
     public List<AuthorityListByLevelResVo> getAuthorityListByLevel() {
         return authorityListByLevel;
     }

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

@@ -13,6 +13,23 @@ public class LoginReqVo extends LoginVo{
 
     private String password;
 
+    /**
+     * 返回状态码
+     * 01：个人基本信息未完善
+     * 02：公司基本信息未完善
+     * 03：未绑定银行卡
+     * 04：未签约
+     */
+    private String code;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getReqId() {
         return reqId;
     }

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

-package com.pangding.web.authority.vo.resvo;
-
-import com.pangding.web.authority.vo.CompanyBankCardVo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/6/8 19:09
- */
-public class CompanyBankCardResVo extends CompanyBankCardVo {
-    private String reservedPhone;
-
-    public String getReservedPhone() {
-        return reservedPhone;
-    }
-
-    public void setReservedPhone(String reservedPhone) {
-        this.reservedPhone = reservedPhone;
-    }
-}

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

 package com.pangding.web.authority.vo.resvo;
 
+import com.pangding.web.authority.vo.CompanyVo;
+
 import java.util.List;
 
 /**
@@ -7,36 +9,16 @@ import java.util.List;
  * @create 2019/5/21 17:01
  */
 public class LoginCompanyResVo {
-    private String id;
-
-    private int status;
-
-    private int companyAttribute;
+    private CompanyVo companyVo;
 
     private List<String> bankCardCodeList;
 
-    public int getCompanyAttribute() {
-        return companyAttribute;
-    }
-
-    public void setCompanyAttribute(int companyAttribute) {
-        this.companyAttribute = companyAttribute;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public int getStatus() {
-        return status;
+    public CompanyVo getCompanyVo() {
+        return companyVo;
     }
 
-    public void setStatus(int status) {
-        this.status = status;
+    public void setCompanyVo(CompanyVo companyVo) {
+        this.companyVo = companyVo;
     }
 
     public List<String> getBankCardCodeList() {