user/role/tright 5.29

首页还没开发完
需要增加手机验证码

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

@@ -3,9 +3,8 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.AuthorityService;
 import com.pangding.web.authority.vo.AuthorityVo;
-import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
-import com.pangding.web.authority.vo.reqvo.WebAuthorityReqVo;
-import com.pangding.web.authority.vo.reqvo.WebAuthorityResVo;
+import com.pangding.web.authority.vo.reqvo.*;
+import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -13,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * @author zhangjinyao
@@ -34,11 +35,11 @@ public class AuthorityController {
     public ResponseResult<String> saveAuthority(@RequestBody AuthorityVo authorityVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("authorityName",authorityVo.getName())
-                .notBlankCheck("authorityUrl",authorityVo.getUrl())
                 .notBlankCheck("type",authorityVo.getType())
                 .notBlankCheck("alias",authorityVo.getAlias())
                 .notBlankCheck("openMode",authorityVo.getOpenMode())
                 .notBlankCheck("remark",authorityVo.getRemark())
+                .notBlankCheck("sort",authorityVo.getSort())
                 .checkException();
         return ResponseResult.result(authorityServiceImpl.save(authorityVo));
     }
@@ -58,25 +59,35 @@ public class AuthorityController {
                 .notBlankCheck("alias",authorityVo.getAlias())
                 .notBlankCheck("openMode",authorityVo.getOpenMode())
                 .notBlankCheck("remark",authorityVo.getRemark())
+                .notBlankCheck("sort",authorityVo.getSort())
                 .checkException();
         return ResponseResult.result(authorityServiceImpl.update(authorityVo));
     }
 
     /**
-     * 查询权限列表
+     * 查询分页权限列表
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<WebAuthorityResVo>> listAuthoritys(ListAuthorityReqVo reqVo){
+    @RequestMapping(value = "/listByPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<WebAuthorityResVo>> listAuthoritys(@RequestBody ListAuthorityByPageReqVo reqVo){
         return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
     }
 
+    /**
+     * 查询不分页权限列表
+     * @return
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<List<AuthorityVo>> list(@RequestBody AuthorityListReqVo reqVo){
+        return ResponseResult.result(authorityServiceImpl.getAuthorityList(reqVo));
+    }
+
     /**
      * 查询一级权限
      * @return
      */
     @RequestMapping(value = "/firstLevel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<WebAuthorityResVo>> parentAuthoritys(ListAuthorityReqVo reqVo){
+    public ResponseResult<PageSizeData<WebAuthorityResVo>> parentAuthoritys(ListAuthorityByPageReqVo reqVo){
         reqVo.setLevelOne("one");
         return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
     }

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

@@ -4,6 +4,8 @@ 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.CompanyResVo;
+import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -74,12 +76,20 @@ public class CompanyController {
         return new ResponseResult();
     }
 
+    @RequestMapping(value = "/updateBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<String> updateBank(@RequestBody CompanyBankCardVo reqVo){
+        checkBank(reqVo);
+        CheckerHelper.newInstance()
+                .notBlankCheck("bankCardId",reqVo.getId())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.updateBank(reqVo));
+    }
+
     private void checkBank(CompanyBankCardVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("bankCardCode",reqVo.getBankCardCode())
                 .notNumberCheck("bankCardCode",reqVo.getBankCardCode())
                 .notBlankCheck("bankName",reqVo.getBankName())
-                .notBlankCheck("bankCode",reqVo.getBankCode())
                 .notBlankCheck("name",reqVo.getName())
                 .notBlankCheck("idCard",reqVo.getIdCard())
                 .notBlankCheck("companyId",reqVo.getCompanyId())

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

@@ -4,6 +4,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.CompanyVo;
+import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.IndexService;
 import com.pangding.web.authority.vo.reqvo.TotalIncomeReqVo;
+import com.pangding.web.authority.vo.reqvo.UserPrecipitationReqVo;
 import com.pangding.web.authority.vo.reqvo.WithdrawCashReqVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -49,4 +50,17 @@ public class IndexController {
                 .checkException();
         return ResponseResult.result(indexServiceImpl.getTotalIncome(reqVo));
     }
+
+    /**
+     * 通过公司id获取该公司的用户沉淀量
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户沉淀量
+     */
+    @PostMapping(value = "/userPrecipitation", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult userPrecipitation(@RequestBody UserPrecipitationReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getId())
+                .checkException();
+        return ResponseResult.result(indexServiceImpl.getUserPrecipitation(reqVo));
+    }
 }

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

@@ -47,17 +47,25 @@ public class LoginController {
                 .checkException();
         LoginResVo resVo = registerServiceImpl.login(reqVo);
         ResponseResult result = new ResponseResult();
-        if (LoginConstant.NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
+        if (LoginConstant.PERSONAL_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
             result.setCode("01");
-            result.setMessage("基本信息未完善，跳转完善页面");
+            result.setMessage("个人基本信息未完善，跳转个人完善页面");
+            result.setData(reqVo);
             return result;
-        }else if (LoginConstant.HAVE_NO_BANK_CARD.equals(resVo.getCode())){
+        }else if (LoginConstant.COMPANY_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
             result.setCode("02");
+            result.setMessage("公司基本信息未完善，跳转公司完善页面");
+            result.setData(reqVo);
+            return result;
+        }else if (LoginConstant.HAVE_NO_BANK_CARD.equals(resVo.getCode())){
+            result.setCode("03");
             result.setMessage("还未添加银行卡，跳转添加银行卡页面");
+            result.setData(reqVo);
             return result;
         }else if (LoginConstant.NOT_SIGNING.equals(resVo.getCode())){
-            result.setCode("03");
+            result.setCode("04");
             result.setMessage("未签约，跳转签约页面");
+            result.setData(reqVo);
             return result;
         }
         return ResponseResult.result(registerServiceImpl.login(reqVo));

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

 package com.pangding.web.authority.controller;
 
-import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.vo.CompanyVo;
+import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,7 +4,7 @@ package com.pangding.web.authority.controller;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.service.RoleService;
-import com.pangding.web.authority.vo.reqvo.WebRoleResVo;
+import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;

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

@@ -3,6 +3,7 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
+import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -34,7 +35,6 @@ public class UserController {
                 .notBlankCheck("password",webUserReqVo.getPassword())
                 .checkPhoneNo("phone",webUserReqVo.getPhone())
                 .notBlankCheck("companyId",webUserReqVo.getCompanyId())
-                .notBlankCheck("status",webUserReqVo.getStatus())
                 .checkException();
         return ResponseResult.result(userServiceImpl.saveUser(webUserReqVo));
     }
@@ -52,7 +52,6 @@ public class UserController {
                 .notBlankCheck("password",webUserReqVo.getPassword())
                 .checkPhoneNo("phone",webUserReqVo.getPhone())
                 .notBlankCheck("companyId",webUserReqVo.getCompanyId())
-                .notBlankCheck("status",webUserReqVo.getStatus())
                 .checkException();
         return ResponseResult.result(userServiceImpl.updateUser(webUserReqVo));
     }

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

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
 import com.pangding.web.authority.vo.AuthorityVo;
-import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
+import com.pangding.web.authority.vo.reqvo.ListAuthorityByPageReqVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
-import java.util.List;
-
 /**
  * @author zhangjinyao
  */
@@ -26,6 +23,6 @@ public interface AuthorityDao extends BaseDao {
      * @param reqVo
      * @return 权限分页对象
      */
-    PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo);
+    PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityByPageReqVo reqVo);
 
 }

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

+package com.pangding.web.authority.dao;
+
+import com.pangding.web.authority.vo.reqvo.WechatUserGetReqVo;
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/29 17:10
+ */
+public interface WechatUserDao extends BaseDao {
+    /**
+     * 通过公司id获取该公司的用户沉淀量
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户沉淀量
+     */
+    int getUserPrecipitation(WechatUserGetReqVo reqVo);
+}

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

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.AuthorityDao;
-import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
 import com.pangding.web.authority.vo.AuthorityVo;
-import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
+import com.pangding.web.authority.vo.reqvo.ListAuthorityByPageReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 /**
  * @author zhangjinyao
  */
@@ -27,6 +25,7 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
         table.add(SELECT,"select * from pd_authority where 1=1")
                 .add("id","and pid = ? ")
                 .add("pid","and pid = ? ")
+                .add("sort","and sort = ?")
                 .add("levelOne","and pid = ''");
     }
 
@@ -47,7 +46,7 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
      * @return 权限分页对象
      */
     @Override
-    public PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo) {
+    public PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityByPageReqVo reqVo) {
         return this.queryPage(AuthorityVo.class,reqVo,SELECT,reqVo);
     }
 

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

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.WechatUserDao;
+import com.pangding.web.authority.vo.WechatUserVo;
+import com.pangding.web.authority.vo.reqvo.WechatUserGetReqVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/29 17:13
+ */
+@Component
+public class WechatUserDaoImpl extends BaseDaoImpl implements WechatUserDao {
+    private static final String GET_USER_PRECIPITATION = "GET_USER_PRECIPITATION";
+
+    @Override
+    protected void init() {
+        register(WechatUserVo.class);
+
+        table.add(GET_USER_PRECIPITATION,"select count(company_id) from pd_wechat_user where 1=1 ")
+                .add("companyId","and company_id = ?");
+    }
+
+    /**
+     * 通过公司id获取该公司的用户沉淀量
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户沉淀量
+     */
+    @Override
+    public int getUserPrecipitation(WechatUserGetReqVo reqVo) {
+        return this.queryFirst(int.class,GET_USER_PRECIPITATION,reqVo);
+    }
+}

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

 package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.AuthorityVo;
-import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
-import com.pangding.web.authority.vo.reqvo.WebAuthorityReqVo;
-import com.pangding.web.authority.vo.reqvo.WebAuthorityResVo;
-import com.pangding.web.authority.vo.reqvo.WebUserResVo;
+import com.pangding.web.authority.vo.reqvo.*;
+import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
@@ -60,6 +58,12 @@ public interface AuthorityService {
      * @param reqVo
      * @return 权限返回信息分页对象
      */
-    PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo);
+    PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityByPageReqVo reqVo);
+
+    /**
+     * 查询不分页权限列表
+     * @return
+     */
+    List<AuthorityVo> getAuthorityList(AuthorityListReqVo reqVo);
 
 }

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

@@ -4,6 +4,8 @@ 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.CompanyResVo;
+import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 /**
@@ -55,6 +57,8 @@ public interface CompanyService{
 
     void deleteBank(CompanyBankCardVo reqVo);
 
+    String updateBank(CompanyBankCardVo reqVo);
+
     /**
      * 提交银行卡信息，验证手机验证码，并更新银行卡状态
      * @param reqVo 银行卡表数据+验证码

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

 package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.reqvo.TotalIncomeReqVo;
+import com.pangding.web.authority.vo.reqvo.UserPrecipitationReqVo;
 import com.pangding.web.authority.vo.reqvo.WithdrawCashReqVo;
 
 import java.math.BigDecimal;
@@ -17,5 +18,17 @@ public interface IndexService {
      */
     BigDecimal getWithdrawCash(WithdrawCashReqVo reqVo);
 
+    /**
+     * 通过公司id获取该公司累积总收益
+     * @param reqVo 封装了公司id的请求对象
+     * @return 累计总收益
+     */
     BigDecimal getTotalIncome(TotalIncomeReqVo reqVo);
+
+    /**
+     * 通过公司id获取该公司的用户沉淀量
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户沉淀量
+     */
+    int getUserPrecipitation(UserPrecipitationReqVo reqVo);
 }

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

@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.CompanyExtendVo;
 import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.CompanyVo;
+import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;

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

@@ -4,7 +4,7 @@ import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.vo.RoleVo;
-import com.pangding.web.authority.vo.reqvo.WebRoleResVo;
+import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.*;
+import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;

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

@@ -5,6 +5,7 @@ import com.pangding.web.authority.dao.AuthorityDao;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.AuthorityService;
 import com.pangding.web.authority.vo.*;
+import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
@@ -37,11 +38,29 @@ public class AuthorityServiceImpl implements AuthorityService {
     @Override
     public String save(AuthorityVo authorityVo) {
         this.checkValid(authorityVo);
+        if (null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()){
+            authorityVo.setPid("");
+            checkSort(authorityVo);
+        }
         authorityVo.setId(StringHelper.getNewID());
         authorityDao.create(authorityVo);
         return authorityVo.getId();
     }
 
+    /**
+     * 检查权限排序是否重复
+     * @param authorityVo 权限对象
+     */
+    private void checkSort(AuthorityVo authorityVo){
+        AuthorityGetReqVo reqVo = new AuthorityGetReqVo();
+        reqVo.setPid(authorityVo.getPid());
+        reqVo.setSort(authorityVo.getSort());
+        AuthorityVo authorityVo1 = authorityDao.load(reqVo,AuthorityVo.class);
+        if (authorityVo1 != null){
+            throw new CodeException("该权限排序已存在");
+        }
+    }
+
     /**
      * 更新authorityVo对象数据
      *
@@ -51,6 +70,10 @@ public class AuthorityServiceImpl implements AuthorityService {
     @Override
     public String update(AuthorityVo authorityVo) {
         this.checkValid(authorityVo);
+        if (null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()){
+            authorityVo.setPid("");
+            checkSort(authorityVo);
+        }
         authorityDao.update(authorityVo);
         return authorityVo.getId();
     }
@@ -123,7 +146,7 @@ public class AuthorityServiceImpl implements AuthorityService {
      * @return 权限返回信息分页对象
      */
     @Override
-    public PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo) {
+    public PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityByPageReqVo reqVo) {
         PageSizeData<AuthorityVo> authorityVoPageSizeData = authorityDao.getAuthorityList(reqVo);
         PageSizeData<WebAuthorityResVo> webAuthorityResVoPageSizeData = new PageSizeData();
         List<AuthorityVo> authorityVoList = authorityVoPageSizeData.getList();
@@ -141,4 +164,17 @@ public class AuthorityServiceImpl implements AuthorityService {
 
         return webAuthorityResVoPageSizeData;
     }
+
+    /**
+     * 查询不分页权限列表
+     * @return
+     */
+    @Override
+    public List<AuthorityVo> getAuthorityList(AuthorityListReqVo reqVo) {
+        List<AuthorityVo> authorityVoList = authorityDao.loadList(reqVo,AuthorityVo.class);
+        if (null == authorityVoList || authorityVoList.isEmpty()){
+            throw new CodeException("暂无权限，请先添加");
+        }
+        return authorityVoList;
+    }
 }

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

@@ -12,6 +12,8 @@ import com.pangding.web.authority.vo.CompanyExtendVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.*;
+import com.pangding.web.authority.vo.resvo.CompanyResVo;
+import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
@@ -167,7 +169,7 @@ public class CompanyServiceImpl implements CompanyService{
     }
 
     /**
-     * 保存银行卡信息，并调用第三方接口发送手机验证码
+     * 保存/更新银行卡信息，并调用第三方接口发送手机验证码
      *
      * @param reqVo 公司银行卡表信息
      * @return 银行卡表主键
@@ -176,17 +178,29 @@ public class CompanyServiceImpl implements CompanyService{
     @Transactional(rollbackFor = Exception.class)
     public String saveBank(CompanyBankCardVo reqVo) {
         String id = StringHelper.getNewID();
-        reqVo.setId(id);
-        BankCardListReqVo reqVo1 = new BankCardListReqVo();
-        PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
 
-        /*若该银行卡是第一张银行卡，则设为默认*/
-        if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()){
-            reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+        /*若该卡存在，则修改*/
+        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+        getReqVo.setId(reqVo.getId());
+        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
+        if (null != companyBankCardVo){
+            companyBankCardDao.update(reqVo);
         }
-        companyBankCardDao.create(reqVo);
+        /*若卡不存在，则新增*/
+        else{
+            reqVo.setId(id);
+            BankCardListReqVo reqVo1 = new BankCardListReqVo();
+            PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
+
+            /*若该银行卡是第一张银行卡，则设为默认*/
+            if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()){
+                reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            }
+            companyBankCardDao.create(reqVo);
+        }
+
         /*此处需要调用第三方接口发送手机验证码*/
-        return id;
+        return reqVo.getId();
     }
 
     @Override
@@ -194,6 +208,12 @@ public class CompanyServiceImpl implements CompanyService{
         companyBankCardDao.remove(reqVo);
     }
 
+    @Override
+    public String updateBank(CompanyBankCardVo reqVo) {
+        companyBankCardDao.update(reqVo);
+        return reqVo.getId();
+    }
+
     @Override
     public void setDefault(CompanyBankCardVo reqVo) {
         /*获取该银行卡的公司id*/
@@ -215,7 +235,10 @@ public class CompanyServiceImpl implements CompanyService{
      */
     @Override
     public CompanyBankCardVo bankSubmit(BankSubmitReqVo reqVo) {
-        /*此处应该将请求数据发送到第三方接口，获取到的返回值用于更新银行卡状态*/
+        if (null != reqVo.getVerifyCode() || reqVo.getVerifyCode().isEmpty()){
+            /*此处应该将请求数据发送到第三方接口，获取到的返回值用于更新银行卡状态*/
+        }
+
         CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
         return companyBankCardVo;

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.CompanyExtendDao;
+import com.pangding.web.authority.dao.WechatUserDao;
 import com.pangding.web.authority.service.IndexService;
 import com.pangding.web.authority.vo.CompanyExtendVo;
 import com.pangding.web.authority.vo.reqvo.TotalIncomeReqVo;
+import com.pangding.web.authority.vo.reqvo.UserPrecipitationReqVo;
+import com.pangding.web.authority.vo.reqvo.WechatUserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.WithdrawCashReqVo;
 import com.yanzuoguang.util.exception.CodeException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +22,8 @@ import java.math.BigDecimal;
 public class IndexServiceImpl implements IndexService {
     @Autowired
     CompanyExtendDao companyExtendDaoImpl;
+    @Autowired
+    WechatUserDao wechatUserDaoImpl;
 
     /**
      * 通过公司id获取该公司的可提现余额
@@ -38,10 +43,27 @@ public class IndexServiceImpl implements IndexService {
         return cash;
     }
 
+    /**
+     * 通过公司id获取该公司累积总收益
+     * @param reqVo 封装了公司id的请求对象
+     * @return 累计总收益
+     */
     @Override
     public BigDecimal getTotalIncome(TotalIncomeReqVo reqVo) {
         /*此处需调用订单服务获取累积总收益
         * 目前仅返回null*/
         return null;
     }
+
+    /**
+     * 通过公司id获取该公司的用户沉淀量
+     * @param reqVo 封装了公司id的请求对象
+     * @return  用户沉淀量
+     */
+    @Override
+    public int getUserPrecipitation(UserPrecipitationReqVo reqVo) {
+        WechatUserGetReqVo getReqVo = new WechatUserGetReqVo();
+        getReqVo.setCompanyId(reqVo.getId());
+        return wechatUserDaoImpl.getUserPrecipitation(getReqVo);
+    }
 }

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

@@ -5,12 +5,16 @@ import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.service.VerifyCodeService;
 import com.pangding.web.authority.util.CompanyBankCardConstant;
+import com.pangding.web.authority.util.CompanyConstant;
+import com.pangding.web.authority.util.LoginConstant;
 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.service.RegisterService;
 import com.pangding.web.authority.service.UserService;
+import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
+import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -50,6 +54,10 @@ public class RegisterServiceImpl implements RegisterService {
     private CompanyService companyService;
     @Autowired
     VerifyCodeService verifyCodeServiceImpl;
+    @Autowired
+    RoleAuthorityDao roleAuthorityDaoImpl;
+    @Autowired
+    AuthorityDao authorityDaoImpl;
 
     /**
      * 判断注册编码是否存在
@@ -245,39 +253,35 @@ public class RegisterServiceImpl implements RegisterService {
         }else {
             userVo = userServiceImpl.getUserByAccount(accountOrPhone);
         }
-
         if (userVo == null){
             throw new CodeException("用户名或密码错误");
         }
-
         if (!(StringHelper.md5(reqVo.getPassword()).equals(userVo.getPassword()))){
             throw new CodeException("用户名或密码错误");
         }
-
         String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
         TokenHelper.write(token,reqVo);
-
         LoginResVo resVo = new LoginResVo();
-
         resVo.setToken(token);
-
         resVo.setAccount(userVo.getAccount());
-
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(userVo.getCompanyId());
         CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
-
-        /*判断基本信息是否完善，及状态是否为2，若不完善则跳转完善页面*/
-        if (companyVo.getStatus() != 2){
+        /*判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面*/
+        if (companyVo.getStatus() != LoginConstant.FINISHED_BASIC_INFO && CompanyConstant.COMPANY_TYPE_PERSON == companyVo.getCompanyType()){
             resVo.setCode("01");
             return resVo;
         }
+        /*判断基本信息是否完善，及状态是否为2，且为公司用户，若不完善则跳转个人完善页面*/
+        else if (companyVo.getStatus() != LoginConstant.FINISHED_BASIC_INFO && CompanyConstant.COMPANY_TYPE_COMPANY == companyVo.getCompanyType()){
+            resVo.setCode("02");
+            return resVo;
+        }
         /*判断电子签约状态，若不为10，则跳转签约页面*/
-        else if (companyVo.getSigningStatus() != 10){
-            resVo.setCode("03");
+        else if (companyVo.getSigningStatus() != LoginConstant.HAVE_SIGNED){
+            resVo.setCode("04");
             return resVo;
         }
-
         LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
         loginCompanyResVo.setId(companyVo.getId());
         loginCompanyResVo.setStatus(companyVo.getStatus());
@@ -293,13 +297,42 @@ public class RegisterServiceImpl implements RegisterService {
             }
         }else{
             /*该公司没有银行卡，需要跳转添加银行卡*/
-            resVo.setCode("02");
+            resVo.setCode("03");
             return resVo;
         }
+        /*获取用户权限列表*/
+        UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
+        userRoleGetReqVo.setUserId(userVo.getId());
+        List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(userRoleGetReqVo,UserRoleVo.class);
+        if (null != userRoleVoList && !userRoleVoList.isEmpty()){
+            List<String> roleIdList = new ArrayList();
+            for (UserRoleVo userRoleVo:userRoleVoList) {
+                roleIdList.add(userRoleVo.getRoleId());
+            }
+            List<String> authorityIdList = new ArrayList();
+            for (String roleId:roleIdList) {
+                RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+                roleAuthorityGetReqVo.setRoleId(roleId);
+                List<RoleAuthorityVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo,RoleAuthorityVo.class);
+                if (roleAuthorityVoList != null && !roleAuthorityVoList.isEmpty()){
+                    List<String> authorityIds = new ArrayList();
+                    for (RoleAuthorityVo roleAuthorityVo:roleAuthorityVoList) {
+                        authorityIds.add(roleAuthorityVo.getAuthorityId());
+                    }
+                    authorityIdList.addAll(authorityIds);
+                }
+            }
+            List<AuthorityVo> authorityVoList = new ArrayList();
+            for (String authorityId:authorityIdList) {
+                AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
+                authorityGetReqVo.setId(authorityId);
+                AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
+                authorityVoList.add(authorityVo);
+            }
+            resVo.setAuthorityVoList(authorityVoList);
+        }
         loginCompanyResVo.setBankCardCodeList(bankCardCodeList);
-
         resVo.setCompanyResVo(loginCompanyResVo);
-
         return resVo;
     }
 

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

@@ -7,6 +7,7 @@ import com.pangding.web.authority.dao.UserRoleDao;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.RoleService;
 import com.pangding.web.authority.vo.*;
+import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;

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

@@ -6,6 +6,7 @@ import com.pangding.web.authority.dao.UserRoleDao;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.*;
+import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;

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

@@ -6,20 +6,38 @@ package com.pangding.web.authority.util;
  */
 public class LoginConstant {
     /**
-     * 基本信息为完善
+     * 个人基本信息为完善
      * 值："01"
      */
-    public static final String NOT_FINISH_BASIC_INFO = "01";
+    public static final String PERSONAL_NOT_FINISH_BASIC_INFO = "01";
 
     /**
-     * 未绑定银行卡
+     * 公司基本信息未完善
      * 值："02"
      */
-    public static final String HAVE_NO_BANK_CARD = "02";
+    public static final String COMPANY_NOT_FINISH_BASIC_INFO = "02";
 
     /**
-     * 未签约
+     * 未绑定银行卡
      * 值："03"
      */
-    public static final String NOT_SIGNING = "03";
+    public static final String HAVE_NO_BANK_CARD = "03";
+
+    /**
+     * 未签约
+     * 值："04"
+     */
+    public static final String NOT_SIGNING = "04";
+
+    /**
+     * 已完善基本信息
+     * 值：2
+     */
+    public static final int FINISHED_BASIC_INFO = 2;
+
+    /**
+     * 已签约
+     * 值：10
+     */
+    public static final int HAVE_SIGNED = 10;
 }

src/main/java/com/pangding/web/authority/vo/AuthorityVo.java

@@ -36,6 +36,16 @@ public class AuthorityVo implements Serializable, InitDao {
 
     private String createTime;
 
+    private int sort;
+
+    public int getSort() {
+        return sort;
+    }
+
+    public void setSort(int sort) {
+        this.sort = sort;
+    }
+
     public String getId() {
         return id;
     }

src/main/java/com/pangding/web/authority/vo/WechatUserVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+import com.yanzuoguang.util.vo.InitDao;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/29 16:25
+ */
+@TableAnnotation("pd_wechat_user")
+public class WechatUserVo implements Serializable, InitDao {
+    private String id;
+
+    private String nickname;
+
+    private String gender;
+
+    private String unionid;
+
+    private String openid;
+
+    @TableAnnotation("company_id")
+    private String companyId;
+
+    private String integral;
+
+    private BigDecimal cash;
+
+    @TableAnnotation("head_portrait")
+    private String headPortrait;
+
+    private String address;
+
+    private int status;
+
+    private int age;
+
+    @TableAnnotation("follow_time")
+    private String followTime;
+
+    @TableAnnotation("unfollow_time")
+    private String unfollowTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getIntegral() {
+        return integral;
+    }
+
+    public void setIntegral(String integral) {
+        this.integral = integral;
+    }
+
+    public BigDecimal getCash() {
+        return cash;
+    }
+
+    public void setCash(BigDecimal cash) {
+        this.cash = cash;
+    }
+
+    public String getHeadPortrait() {
+        return headPortrait;
+    }
+
+    public void setHeadPortrait(String headPortrait) {
+        this.headPortrait = headPortrait;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getFollowTime() {
+        return followTime;
+    }
+
+    public void setFollowTime(String followTime) {
+        this.followTime = followTime;
+    }
+
+    public String getUnfollowTime() {
+        return unfollowTime;
+    }
+
+    public void setUnfollowTime(String unfollowTime) {
+        this.unfollowTime = unfollowTime;
+    }
+
+    @Override
+    public void init() {
+
+    }
+}

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

 package com.pangding.web.authority.vo.cloudvo;
 
 import com.pangding.web.authority.vo.*;
-import com.pangding.web.authority.vo.reqvo.LoginCompanyResVo;
+import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 
 import java.util.List;
 
@@ -16,6 +16,18 @@ public class LoginResVo {
 
     private String code;
 
+    private LoginCompanyResVo companyResVo;
+
+    private List<AuthorityVo> authorityVoList;
+
+    public List<AuthorityVo> getAuthorityVoList() {
+        return authorityVoList;
+    }
+
+    public void setAuthorityVoList(List<AuthorityVo> authorityVoList) {
+        this.authorityVoList = authorityVoList;
+    }
+
     public String getCode() {
         return code;
     }
@@ -24,8 +36,6 @@ public class LoginResVo {
         this.code = code;
     }
 
-    private LoginCompanyResVo companyResVo;
-
     public String getToken() {
         return token;
     }

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

@@ -5,10 +5,29 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/11 15:05
  */
 public class AuthorityGetReqVo {
+    private String reqId;
     private String id;
 
     private String pid;
 
+    private int sort;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public int getSort() {
+        return sort;
+    }
+
+    public void setSort(int sort) {
+        this.sort = sort;
+    }
+
     public String getPid() {
         return pid;
     }

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/29 16:08
+ */
+public class AuthorityListReqVo {
+    private String reqId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+}

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

@@ -6,7 +6,9 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
  * @Author zhangjinyao
  * @create 2019/5/23 19:31
  */
+
 public class BankCardListReqVo extends PageSizeReqVo {
+    private String reqId;
     private String companyId;
 
     public String getCompanyId() {
@@ -16,4 +18,12 @@ public class BankCardListReqVo extends PageSizeReqVo {
     public void setCompanyId(String companyId) {
         this.companyId = companyId;
     }
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
 }

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

@@ -7,8 +7,17 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
  * @create 2019/5/23 18:48
  */
 public class BankSubmitReqVo extends CompanyBankCardVo {
+    private String reqId;
     private String verifyCode;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getVerifyCode() {
         return verifyCode;
     }

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

@@ -7,6 +7,7 @@ import com.pangding.web.authority.vo.CompanyVo;
  * @create 2019/5/23 18:06
  */
 public class CompanyAndCompanyExtendSaveReqVo extends CompanyVo {
+    private String reqId;
 
     private String qrCode;
 
@@ -36,6 +37,14 @@ public class CompanyAndCompanyExtendSaveReqVo extends CompanyVo {
 
     private String invitationCode;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getQrCode() {
         return qrCode;
     }

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

@@ -5,8 +5,28 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/21 17:28
  */
 public class CompanyBankCardGetReqVo {
+    private String reqId;
+
+    private String id;
+
     private String companyId;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getCompanyId() {
         return companyId;
     }

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

@@ -5,10 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/28 10:21
  */
 public class CompanyBankCardSetNotDefaultReqVo {
+    private String reqId;
+
     private String id;
 
     private String companyId;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -5,10 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/21 10:55
  */
 public class CompanyExtendGetReqVo {
+    private String reqId;
+
     private String invitationCode;
 
     private String id;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -5,8 +5,18 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/13 15:45
  */
 public class CompanyGetReqVo {
+    private String reqId;
+
     private String id;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -7,12 +7,22 @@ import com.pangding.web.authority.vo.LoginVo;
  * @create 2019/5/27 15:17
  */
 public class ComputerLoginReqVo extends LoginVo {
+    private String reqId;
+
     private String accountOrPhone;
 
     private String password;
 
     private String verifyCode;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getAccountOrPhone() {
         return accountOrPhone;
     }

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

@@ -5,10 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/23 19:26
  */
 public class CreateQrCodeUrlReqVo {
+    private String reqId;
+
     private String companyId;
 
     private String select;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getCompanyId() {
         return companyId;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/ListAuthorityReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/ListAuthorityByPageReqVo.java

@@ -6,10 +6,19 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
  * @Author zhangjinyao
  * @create 2019/5/15 20:03
  */
-public class ListAuthorityReqVo extends PageSizeReqVo {
+public class ListAuthorityByPageReqVo extends PageSizeReqVo {
+    private String reqId;
 
     private String levelOne;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getLevelOne() {
         return levelOne;
     }

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

@@ -7,4 +7,13 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
  * @create 2019/5/23 14:28
  */
 public class ListCompanyReqVo extends PageSizeReqVo {
+    private String reqId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
 }

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

@@ -7,4 +7,13 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
  * @create 2019/5/15 17:54
  */
 public class ListRoleReqVo extends PageSizeReqVo {
+    private String reqId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
 }

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

@@ -7,4 +7,13 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
  * @create 2019/5/15 19:17
  */
 public class ListUserReqVo extends PageSizeReqVo{
+    private String reqId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
 }

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

@@ -7,11 +7,20 @@ import com.pangding.web.authority.vo.LoginVo;
  * @create 2019/5/14 11:46
  */
 public class LoginReqVo extends LoginVo{
+    private String reqId;
 
     private String accountOrPhone;
 
     private String password;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getAccountOrPhone() {
         return accountOrPhone;
     }

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

@@ -5,6 +5,8 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/14 18:30
  */
 public class RegisterEnterpriceReqVo {
+    private String reqId;
+
     private String id;
 
     private String invitationCompanyId;
@@ -37,6 +39,14 @@ public class RegisterEnterpriceReqVo {
 
     private String reservedPhone;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -5,6 +5,7 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/13 17:32
  */
 public class RegisterIndividualReqVo {
+    private String reqId;
 
     private String id;
 
@@ -26,6 +27,14 @@ public class RegisterIndividualReqVo {
 
     private String contactPhone;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -6,6 +6,7 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/13 15:17
  */
 public class RegisterUserReqVo {
+    private String reqId;
 
     private String account;
 
@@ -17,6 +18,14 @@ public class RegisterUserReqVo {
 
     private String invitationCode;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getConfirmPassword() {
         return confirmPassword;
     }

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

@@ -5,10 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/11 16:41
  */
 public class RoleAuthorityGetReqVo {
+    private String reqId;
+
     private String authorityId;
 
     private String roleId;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getRoleId() {
         return roleId;
     }

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

@@ -5,10 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/10 20:09
  */
 public class RoleGetReqVo {
+    private String reqId;
+
     private String id;
 
     private String name;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -5,11 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/27 11:51
  */
 public class TotalIncomeReqVo {
+    private String reqId;
     /**
      * 公司id
      */
     private String id;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -8,6 +8,8 @@ import org.springframework.context.annotation.Bean;
  */
 
 public class UserGetReqVo {
+    private String reqId;
+
     private String account;
 
     private String companyId;
@@ -16,6 +18,14 @@ public class UserGetReqVo {
 
     private String phone;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getCompanyId() {
         return companyId;
     }

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/29 16:21
+ */
+public class UserPrecipitationReqVo {
+    private String reqId;
+    /**
+     * 公司id
+     */
+    private String id;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

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

@@ -5,10 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/11 15:37
  */
 public class UserRoleGetReqVo {
+    private String reqId;
+
     private String roleId;
 
     private String userId;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getUserId() {
         return userId;
     }

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

@@ -5,8 +5,18 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/10 19:47
  */
 public class UserRoleRemoveReqVo {
+    private String reqId;
+
     private String id;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -5,8 +5,18 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/15 15:59
  */
 public class WebAuthorityReqVo {
+    private String reqId;
+
     private String id;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -8,9 +8,18 @@ import java.util.List;
  * @author zhangjinyao
  */
 public class WebRoleReqVo extends RoleVo {
+    private String reqId;
 
     private List<String> authorityIds;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public List<String> getAuthorityIds() {
         return authorityIds;
     }

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

@@ -8,9 +8,18 @@ import java.util.List;
  * @author zhangjinyao
  */
 public class WebUserReqVo extends UserVo {
+    private String reqId;
 
     private List<String> roleIds;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public List<String> getRoleIds() {
         return roleIds;
     }

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/29 17:25
+ */
+public class WechatUserGetReqVo {
+    private String reqId;
+
+    private String companyId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}

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

@@ -5,11 +5,20 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/5/27 11:13
  */
 public class WithdrawCashReqVo {
+    private String reqId;
     /**
      * 公司id
      */
     private String id;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getId() {
         return id;
     }

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

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyExtendVo;

src/main/java/com/pangding/web/authority/vo/reqvo/DetailResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/DetailResVo.java

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;

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

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 import java.util.List;
 

src/main/java/com/pangding/web/authority/vo/reqvo/SaveCompanyResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/SaveCompanyResVo.java

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 /**
  * @Author zhangjinyao

src/main/java/com/pangding/web/authority/vo/reqvo/WebAuthorityResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/WebAuthorityResVo.java

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.AuthorityVo;
 

src/main/java/com/pangding/web/authority/vo/reqvo/WebRoleResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/WebRoleResVo.java

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.RoleVo;

src/main/java/com/pangding/web/authority/vo/reqvo/WebUserResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/WebUserResVo.java

-package com.pangding.web.authority.vo.reqvo;
+package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.RoleVo;
 import com.pangding.web.authority.vo.UserVo;