user/role/tright 6.5

修改了我的管理的添加公司
还需要调用其他服务

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

@@ -6,6 +6,7 @@ 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.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -28,48 +29,17 @@ public class CompanyManagementController {
     @Autowired
     CompanyService companyServiceImpl;
 
-
-
-
-    /**y
-     * 新增/修改公司信息
-     * @param reqVo 公司以及公司扩展表信息
-     * @return 公司信息
-     */
-    @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<CompanyVo> saveCompany(@RequestBody CompanyAndCompanyExtendSaveReqVo reqVo){
-        CheckerHelper.newInstance()
-                .notBlankCheck("companyName",reqVo.getCompanyName())
-                .notBlankCheck("companyType",reqVo.getCompanyType())
-                .notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
-                .notBlankCheck("address",reqVo.getAddress())
-                .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
-                .notBlankCheck("contactName",reqVo.getContactName())
-                .notBlankCheck("contactPhone",reqVo.getContactPhone())
-                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
-                .notBlankCheck("contactCode",reqVo.getContactCode())
-                .checkIdCard("contactCode",reqVo.getContactCode())
-                .notBlankCheck("electromicAgreementCode",reqVo.getElectromicAgreementCode())
-                .notBlankCheck("signingStatus",reqVo.getSigningStatus())
-                .notBlankCheck("status",reqVo.getStatus())
-                .notBlankCheck("nature",reqVo.getNature())
-                .notBlankCheck("productOrInterface",reqVo.getProductOrInterface())
-                .checkException();
-        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
-    }
-
-
     /**y
      * 商户查看详情，根据公司id返回用户信息和公司主表信息
      * @param reqVo 包含公司id的请求对象
      * @return 封装了用户，公司主表信息的对象
      */
     @RequestMapping(value = "/detail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<DetailResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
+    public ResponseResult<CompanyResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getId())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.getDetail(reqVo));
+        return ResponseResult.result(companyServiceImpl.pdGetDetail(reqVo));
     }
 
     /**y
@@ -120,8 +90,8 @@ public class CompanyManagementController {
                 .notBlankCheck("idCard",reqVo.getIdCard())
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkIdCard("idCard",reqVo.getIdCard())
-                .notBlankCheck("reservedPhone",reqVo.getReservedPhone())
-                .checkPhoneNo("reservedPhone",reqVo.getReservedPhone())
+                .notBlankCheck("phone",reqVo.getPhone())
+                .checkPhoneNo("phone",reqVo.getPhone())
                 .checkException();
     }
 
@@ -162,6 +132,9 @@ public class CompanyManagementController {
         CheckerHelper.newInstance()
                 .notBlankCheck("account",reqVo.getAccount())
                 .notBlankCheck("password",reqVo.getPassword())
+                .notBlankCheck("confirmPassword",reqVo.getConfirmPassword())
+                .notBlankCheck("name",reqVo.getName())
+                .notBlankCheck("email",reqVo.getEmail())
                 .notBlankCheck("phone",reqVo.getPhone())
                 .checkPhoneNo("phone",reqVo.getPhone())
                 .notBlankCheck("createId",reqVo.getCreateId())
@@ -201,4 +174,32 @@ public class CompanyManagementController {
         companyServiceImpl.setDefault(reqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 批量删除用户
+     * @param reqVo 封装了用户id列表的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/batchDelete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult batchDelete(@RequestBody BatchDeleteReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("userIdList",reqVo.getUserIdList())
+                .checkException();
+        companyServiceImpl.batchDelete(reqVo);
+        return new ResponseResult();
+    }
+
+    /**
+     * 批量更新用户信息
+     * @param reqVo 封装了用户列表的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/batchUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult batchUpdate(@RequestBody BatchUpdateReqVo reqVo) throws Exception {
+        CheckerHelper.newInstance()
+                .notBlankCheck("userList",reqVo.getUserVoList())
+                .checkException();
+        companyServiceImpl.batchUpdate(reqVo);
+        return new ResponseResult();
+    }
 }

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

@@ -5,6 +5,7 @@ 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.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -60,32 +61,46 @@ public class PangdingManagementController {
     }
 
     /**y
-     * 新增/修改公司信息
+     * 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
      * @param reqVo 公司以及公司扩展表信息
      * @return 公司信息
      */
     @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<CompanyVo> saveCompany(@RequestBody CompanyAndCompanyExtendSaveReqVo reqVo){
+    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("companyName",reqVo.getCompanyName())
+                .notBlankCheck("account",reqVo.getAccount())
                 .notBlankCheck("companyType",reqVo.getCompanyType())
-                .notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
-                .notBlankCheck("address",reqVo.getAddress())
                 .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
+                .notBlankCheck("merchantName",reqVo.getMerchantName())
+                .notBlankCheck("merchantAddress",reqVo.getMerchantAddress())
+                .notBlankCheck("companyName",reqVo.getCompanyName())
+                .notBlankCheck("companyAddress",reqVo.getCompanyAddress())
+                .notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
                 .notBlankCheck("contactName",reqVo.getContactName())
-                .notBlankCheck("contactPhone",reqVo.getContactPhone())
-                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
                 .notBlankCheck("contactCode",reqVo.getContactCode())
                 .checkIdCard("contactCode",reqVo.getContactCode())
-                .notBlankCheck("electromicAgreementCode",reqVo.getElectromicAgreementCode())
-                .notBlankCheck("signingStatus",reqVo.getSigningStatus())
-                .notBlankCheck("status",reqVo.getStatus())
-                .notBlankCheck("nature",reqVo.getNature())
-                .notBlankCheck("productOrInterface",reqVo.getProductOrInterface())
+                .notBlankCheck("contactPhone",reqVo.getContactPhone())
+                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
     }
 
+
+    /**
+     * 添加公司提交按钮
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult companySubmit(@RequestBody CompanySubmitReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .notBlankCheck("verifyCode",reqVo.getVerifyCode())
+                .checkException();
+        companyServiceImpl.companySubmit(reqVo);
+        return new ResponseResult();
+    }
+
     /**y
      * 我的二维码页面
      * @param reqVo 公司扩展表请求对象
@@ -134,8 +149,8 @@ public class PangdingManagementController {
                 .notBlankCheck("idCard",reqVo.getIdCard())
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkIdCard("idCard",reqVo.getIdCard())
-                .notBlankCheck("reservedPhone",reqVo.getReservedPhone())
-                .checkPhoneNo("reservedPhone",reqVo.getReservedPhone())
+                .notBlankCheck("phone",reqVo.getPhone())
+                .checkPhoneNo("phone",reqVo.getPhone())
                 .checkException();
     }
 
@@ -178,6 +193,9 @@ public class PangdingManagementController {
                 .notBlankCheck("password",reqVo.getPassword())
                 .notBlankCheck("phone",reqVo.getPhone())
                 .checkPhoneNo("phone",reqVo.getPhone())
+                .notBlankCheck("confirmPassword",reqVo.getConfirmPassword())
+                .notBlankCheck("name",reqVo.getName())
+                .notBlankCheck("email",reqVo.getEmail())
                 .notBlankCheck("createId",reqVo.getCreateId())
                 .notBlankCheck("createName",reqVo.getCreateName())
                 .notBlankCheck("companyId",reqVo.getCompanyId())
@@ -226,4 +244,32 @@ public class PangdingManagementController {
         companyServiceImpl.setDefault(reqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 批量删除用户
+     * @param reqVo 封装了用户id列表的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/batchDelete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult batchDelete(@RequestBody BatchDeleteReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("userIdList",reqVo.getUserIdList())
+                .checkException();
+        companyServiceImpl.batchDelete(reqVo);
+        return new ResponseResult();
+    }
+
+    /**
+     * 批量更新用户信息
+     * @param reqVo 封装了用户列表的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/batchUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult batchUpdate(@RequestBody BatchUpdateReqVo reqVo) throws Exception {
+        CheckerHelper.newInstance()
+                .notBlankCheck("userList",reqVo.getUserVoList())
+                .checkException();
+        companyServiceImpl.batchUpdate(reqVo);
+        return new ResponseResult();
+    }
 }

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

 package com.pangding.web.authority.controller;
 
 
+import com.pangding.web.authority.vo.RoleVo;
+import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.service.RoleService;
@@ -58,10 +60,27 @@ public class RoleController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
+    public ResponseResult listRoles(@RequestBody ListRoleReqVo req){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",req.getCompanyId())
+                .checkException();
         return ResponseResult.result(roleServiceImpl.getWebRoleResVoList(req));
     }
 
+    /**
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
+     */
+    @RequestMapping(value = "/countByRole", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult countByRole(@RequestBody CountByRoleReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("roleId",reqVo.getRoleId())
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(roleServiceImpl.countByRole(reqVo));
+    }
+
     /**
      * 根据ID查询角色
      * @param

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

@@ -33,8 +33,10 @@ public class UserController {
         CheckerHelper.newInstance()
                 .notBlankCheck("account",webUserReqVo.getAccount())
                 .notBlankCheck("password",webUserReqVo.getPassword())
+                .notBlankCheck("confirmPassword",webUserReqVo.getConfirmPassword())
                 .checkPhoneNo("phone",webUserReqVo.getPhone())
                 .notBlankCheck("companyId",webUserReqVo.getCompanyId())
+                .notBlankCheck("email",webUserReqVo.getEmail())
                 .checkException();
         return ResponseResult.result(userServiceImpl.saveUser(webUserReqVo));
     }

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

@@ -39,14 +39,6 @@ public interface RoleDao extends BaseDao {
      */
     void checkNameExist(RoleVo roleVo);
 
-    /**
-     * 获取角色分页对象
-     *
-     * @param req
-     * @return 角色分页对象
-     */
-    PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
-
     /**
      * 通过角色id获取子角色列表
      *

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

@@ -24,7 +24,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
 
         table.addExist(CHECK_PHONE,"contact_phone");
 
-        table.add(SELECT,"select * from pd_company where 1=1 ")
+        table.add(SELECT,"select * from pd_company where status <> '12' ")
                 .add("companyName","and company_name = ? ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")

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

@@ -46,12 +46,6 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
         this.checkExist(CHECK_NAME_EXIST,roleVo,"角色名已存在");
     }
 
-    @Override
-    public PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req) {
-
-        return this.queryPage(RoleVo.class,req,SELECT,req);
-    }
-
     @Override
     public List<RoleVo> getChild(RoleGetReqVo roleGetReqVo) {
         return this.query(RoleVo.class,SELECT, roleGetReqVo);

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

@@ -41,12 +41,12 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
 
     @Override
     public void checkAccount(UserVo account) {
-        this.checkExist(CHECK_ACCOUNT,account,"用戶名已存在");
+        this.checkExist(CHECK_ACCOUNT,account,"用戶名已存在:"+account.getAccount());
     }
 
     @Override
     public void checkPhone(UserVo phone) {
-        this.checkExist(CHECK_PHONE,phone,"手机号已存在");
+        this.checkExist(CHECK_PHONE,phone,"手机号已存在:"+phone.getPhone());
     }
 
     @Override

src/main/java/com/pangding/web/authority/feign/PayFeign.java

+package com.pangding.web.authority.feign;
+
+import com.pangding.web.authority.vo.reqvo.CompanyBankReqVo;
+import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/2 18:06
+ */
+@FeignClient(value="pd-interface-pay")
+@RequestMapping(value="/userNew")
+public interface PayFeign {
+    /**
+     * 注册会员
+     * @param req
+     * @return
+     */
+    @RequestMapping(value="/register")
+    public ResponseResult setCompanyInfo(@RequestBody CompanyReqVo req);
+
+    /**
+     * 绑定银行卡
+     * @param req
+     * @return
+     */
+    @RequestMapping(value="/bindback")
+    public ResponseResult bindBack(@RequestBody CompanyBankReqVo req);
+
+    /**
+     * 解绑银行卡
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/unbindBankCard")
+    public ResponseResult unbindBankCard(@RequestBody CompanyBankReqVo req);
+}

src/main/java/com/pangding/web/authority/feign/StoreFeign.java

 package com.pangding.web.authority.feign;
 
+import com.pangding.web.authority.vo.Merchant;
+import com.pangding.web.authority.vo.reqvo.CompanyScenicInfoReqVo;
 import com.pangding.web.authority.vo.reqvo.MerchantCreateReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -20,4 +22,13 @@ public interface StoreFeign {
      */
     @RequestMapping("/merchantCreate")
     public ResponseResult merchantCreate(@RequestBody MerchantCreateReqVo req);
+
+    /**
+     * 通过公司还是id获取商户信息
+     *
+     * @param req
+     * @return
+     */
+    @RequestMapping("/getCompanyScenicInfo")
+    ResponseResult<Merchant> getCompanyScenicInfo(@RequestBody CompanyScenicInfoReqVo req);
 }

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

@@ -6,6 +6,7 @@ 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.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
@@ -54,7 +55,14 @@ public interface CompanyService{
      * @param reqVo 公司以及公司扩展表信息
      * @return 公司id
      */
-    CompanyVo saveCompany(CompanyAndCompanyExtendSaveReqVo reqVo);
+    SaveCompanyResVo saveCompany(SaveCompanyReqVo reqVo);
+
+    /**
+     * 添加公司提交按钮
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
+    void companySubmit(CompanySubmitReqVo reqVo);
 
     /**
      * 仅将公司状态设置为12（停用）
@@ -85,6 +93,11 @@ public interface CompanyService{
      */
     CompanyBankCardVo bankSubmit(BankSubmitReqVo reqVo);
 
+    /**
+     * 设置该银行卡为默认支付，并取消其他银行卡的默认
+     * @param reqVo 封装了银行卡id的请求对象
+     * @return
+     */
     void setDefault(CompanyBankCardVo reqVo);
 
     /**y
@@ -114,4 +127,18 @@ public interface CompanyService{
      * @return 用户id
      */
     String saveUser(WebUserReqVo reqVo) throws Exception;
+
+    /**
+     * 批量删除用户
+     * @param reqVo 封装了用户id列表的请求对象
+     * @return
+     */
+    void batchDelete(BatchDeleteReqVo reqVo);
+
+    /**
+     * 批量更新用户信息
+     * @param reqVo 封装了用户列表的请求对象
+     * @return
+     */
+    void batchUpdate(BatchUpdateReqVo reqVo) throws Exception;
 }

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

 package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.vo.RoleVo;
@@ -46,20 +48,19 @@ public interface RoleService {
     void checkNameExist(RoleVo roleVo);
 
     /**
-     * 获取RoleVo对象列表
+     * 获取角色返回信息
      *
      * @param req
-     * @return RoleVo对象列表分页对象
+     * @return 角色返回信息
      */
-    PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
+    List<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
 
     /**
-     * 获取角色返回信息分页对象
-     *
-     * @param req
-     * @return 角色返回信息分页对象
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
      */
-    PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
+    List<UserVo> countByRole(CountByRoleReqVo reqVo);
 
     /**
      * 通过角色id查询该角色权限id列表

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

@@ -136,4 +136,6 @@ public interface UserService {
      * @return 角色列表
      */
     List<RoleVo> getRoleListByUserId(String userId);
+
+    void checkEmail(String email);
 }

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

@@ -4,26 +4,30 @@ import com.pangding.web.authority.dao.CompanyBankCardDao;
 import com.pangding.web.authority.dao.CompanyDao;
 import com.pangding.web.authority.dao.CompanyExtendDao;
 import com.pangding.web.authority.dao.UserDao;
+import com.pangding.web.authority.feign.PayFeign;
+import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.util.CompanyBankCardConstant;
 import com.pangding.web.authority.util.CompanyConstant;
-import com.pangding.web.authority.vo.CompanyBankCardVo;
-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.util.RsaConstant;
+import com.pangding.web.authority.vo.*;
 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.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import com.pangding.web.util.RSAUtils;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
 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;
 
 /**
@@ -42,6 +46,10 @@ public class CompanyServiceImpl implements CompanyService{
     private UserService userServiceImpl;
     @Autowired
     private UserDao userDaoImpl;
+    @Autowired
+    PayFeign payFeign;
+    @Autowired
+    StoreFeign storeFeign;
 
     /**
      * 修改公司信息
@@ -81,6 +89,21 @@ public class CompanyServiceImpl implements CompanyService{
         if (null != companyVo){
             resVo.setCompanyVo(companyVo);
         }
+
+        /*此处需要根据公司id和productOrInterface获取商户信息*/
+        CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
+        companyScenicInfoReqVo.setCompanyId(companyVo.getId());
+        companyScenicInfoReqVo.setProductOrInterface(companyVo.getProductOrInterface());
+        companyScenicInfoReqVo.setReqId(reqVo.getReqId());
+        try {
+            ResponseResult result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
+            if (null != result && "00".equals(result.getCode())){
+                resVo.setMerchant((Merchant) result.getData());
+            }
+        }catch (Exception e){
+            resVo.setMerchant(null);
+        }
+
         /*获取公司扩展表信息*/
         CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
         companyExtendGetReqVo.setId(reqVo.getId());
@@ -137,46 +160,154 @@ public class CompanyServiceImpl implements CompanyService{
     }
 
     /**
-     * 新增/修改公司信息
+     * 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
      * @param reqVo 公司以及公司扩展表信息
      * @return 公司id
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CompanyVo saveCompany(CompanyAndCompanyExtendSaveReqVo reqVo) {
+    public SaveCompanyResVo saveCompany(SaveCompanyReqVo reqVo) {
+        /*返回结果对象*/
+        SaveCompanyResVo resVo = new SaveCompanyResVo();
+        /*公司主表*/
         CompanyVo companyVo = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo,reqVo);
+        companyVo.setId(StringHelper.getNewID());
+        companyVo.setAddress(reqVo.getCompanyAddress());
+        companyVo.setStatus(0);
 
-        CompanyExtendVo companyExtendVo = new CompanyExtendVo();
-        ObjectHelper.writeWithFrom(companyExtendVo,reqVo);
+        /*调用支付服务注册*/
+        CompanyReqVo companyReqVo = new CompanyReqVo();
+        ObjectHelper.writeWithFrom(companyReqVo,companyVo);
 
-        String id = StringHelper.getNewID();
-        /*若id为空，则新建，若不为空，则更新,且更新修改时间*/
-        /*新增*/
-        if (null == reqVo.getId() || reqVo.getId().isEmpty()){
-            /*保存公司表*/
-            /*此处需要生成二维码源码*/
-            String qrCode = DateHelper.getNow()
-                    .replace("-","")
-                    .replace(":","")
-                    .replace(" ","");
+        if ("1".equals(reqVo.getCompanyType())){
+            /*银行卡表*/
+            CompanyBankCardVo bankCardVo = new CompanyBankCardVo();
+            ObjectHelper.writeWithFrom(bankCardVo,reqVo);
+            bankCardVo.setId(StringHelper.getNewID());
+            bankCardVo.setCompanyId(companyVo.getId());
+            bankCardVo.setName(reqVo.getContactName());
+            bankCardVo.setPhone(reqVo.getContactPhone());
+            bankCardVo.setIdCard(reqVo.getContactCode());
+            bankCardVo.setType(reqVo.getCompanyType());
+            bankCardVo.setStatus(0);
 
-            companyVo.setId(id);
-            companyDao.create(companyVo);
-            /*保存公司扩展表*/
-            companyExtendVo.setId(id);
-            companyExtendVo.setQrCode(qrCode);
-            companyExtendDaoImpl.create(companyExtendVo);
+            CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+            ObjectHelper.writeWithFrom(companyBankReqVo,bankCardVo);
+            companyReqVo.getBankList().add(companyBankReqVo);
         }
-        /*修改*/
-        else{
-            /*更新公司表*/
-            companyVo.setUpdateTime(DateHelper.getNow());
-            companyDao.update(companyVo);
-            /*更新公司扩展表*/
-            companyExtendDaoImpl.update(companyExtendVo);
+
+        /*注册*/
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("保存失败，请重试");
+        }
+        CompanyReqVo res = (CompanyReqVo) result.getData();
+        CompanyVo companyVo1 = new CompanyVo();
+        ObjectHelper.writeWithFrom(companyVo1,res);
+        companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
+
+        /*保存公司主表*/
+        companyDao.save(companyVo1);
+        resVo.setCompanyId(companyVo1.getId());
+        /*保存银行卡表*/
+        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
+        if (null != companyBankReqVoList || !companyBankReqVoList.isEmpty()){
+            CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+            CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
+            ObjectHelper.writeWithFrom(companyBankCardVo,companyBankReqVo);
+            companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            companyBankCardDao.save(companyBankCardVo);
+            resVo.setCompanyBankCardId(companyBankCardVo.getId());
+        }
+
+        /*保存公司扩展表*/
+        CompanyExtendVo extendVo = new CompanyExtendVo();
+        extendVo.setId(companyVo.getId());
+        String qrCode = DateHelper.getNow()
+                .replace("-","")
+                .replace(":","")
+                .replace(" ","");
+        extendVo.setQrCode(qrCode);
+        companyExtendDaoImpl.save(extendVo);
+        resVo.setCompanyExtendId(extendVo.getId());
+
+        /*保存商户表*/
+        MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
+        merchantCreateReqVo.setId(StringHelper.getNewID());
+        merchantCreateReqVo.setType(reqVo.getCompanyAttribute());
+        merchantCreateReqVo.setName(reqVo.getMerchantName());
+        merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
+        merchantCreateReqVo.setUserId(reqVo.getCreateId());
+        merchantCreateReqVo.setUsername(reqVo.getCreateName());
+        merchantCreateReqVo.setProductCompanyId(companyVo.getId());
+        ResponseResult result1 = storeFeign.merchantCreate(merchantCreateReqVo);
+        if (null == result1 || !"00".equals(result1.getCode())){
+            throw new CodeException("保存失败，请重试");
+        }
+        String merchantId = (String) result1.getData();
+        resVo.setMerchantId(merchantId);
+
+        /*保存用户*/
+        UserVo userVo = new UserVo();
+        userVo.setId(StringHelper.getNewID());
+        userVo.setAccount(reqVo.getAccount());
+        userVo.setPassword(StringHelper.md5("123456"));
+        userVo.setRemark("123456");
+        userVo.setCreateId(reqVo.getCreateId());
+        userVo.setCreateName(reqVo.getCreateName());
+        userVo.setCompanyId(companyVo.getId());
+        userDaoImpl.save(userVo);
+        resVo.setUserId(userVo.getId());
+
+        return resVo;
+    }
+
+    /**
+     * 添加公司提交按钮
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void companySubmit(CompanySubmitReqVo reqVo) {
+        CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
+        companyGetReqVo.setId(reqVo.getCompanyId());
+        CompanyVo companyVo = companyDao.load(companyGetReqVo,CompanyVo.class);
+        CompanyReqVo companyReqVo = new CompanyReqVo();
+        ObjectHelper.writeWithFrom(companyReqVo,companyVo);
+        companyReqVo.setValidateCode(reqVo.getVerifyCode());
+        /*若公司类型为企业，则需要加入银行卡*/
+        if (companyVo.getCompanyType() == 1){
+            CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
+            companyBankCardGetReqVo.setCompanyId(reqVo.getCompanyId());
+            List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(companyBankCardGetReqVo,CompanyBankCardVo.class);
+            List<CompanyBankReqVo> companyBankReqVoList = new ArrayList<>();
+            if (null != companyBankCardVoList && !companyBankCardVoList.isEmpty()){
+                CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+                ObjectHelper.writeWithFrom(companyBankCardGetReqVo,companyBankReqVoList.get(0));
+                companyBankReqVoList.add(companyBankReqVo);
+            }
+            companyReqVo.setBankList(companyBankReqVoList);
+        }
+        /*调用支付接口验证验证码*/
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("保存出错，请重试");
+        }
+        CompanyReqVo companyReqVo1 = (CompanyReqVo) result.getData();
+        CompanyVo companyVo1 = new CompanyVo();
+        ObjectHelper.writeWithFrom(companyVo1,companyReqVo1);
+        companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
+        companyDao.update(companyVo1);
+        /*若公司类型为企业，则需要修改银行卡*/
+        if (companyVo1.getCompanyType() == 1){
+            CompanyBankReqVo companyBankReqVo = companyReqVo1.getBankList().get(0);
+            CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+            ObjectHelper.writeWithFrom(companyBankCardVo,companyBankReqVo);
+            companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            companyBankCardDao.update(companyBankCardVo);
         }
-        return companyVo;
     }
 
     /**
@@ -187,9 +318,11 @@ public class CompanyServiceImpl implements CompanyService{
     @Override
     public void deleteCompany(DeleteCompanyReqVo reqVo) {
         /*仅修改公司状态status，不删除数据*/
-        CompanyVo companyVo = new CompanyVo();
-        companyVo.setId(reqVo.getCompanyId());
+        CompanyGetReqVo getReqVo = new CompanyGetReqVo();
+        getReqVo.setId(reqVo.getCompanyId());
+        CompanyVo companyVo = companyDao.load(getReqVo,CompanyVo.class);
         companyVo.setStatus(CompanyConstant.COMPANY_STATUS_STOP);
+        companyVo.setUpdateTime(DateHelper.getNow());
         companyDao.update(companyVo);
     }
 
@@ -227,19 +360,43 @@ public class CompanyServiceImpl implements CompanyService{
         }
 
         /*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
+        ResponseResult result = payFeign.bindBack(companyBankReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("绑定银行卡失败，请重试");
+        }
+        CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
+        CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+        ObjectHelper.writeWithFrom(companyBankCardVo,resVo);
+        companyBankCardVo.setIsDefault(reqVo.getIsDefault());
+        companyBankCardDao.update(companyBankCardVo);
         return reqVo.getId();
     }
 
     /**
-     * 删除银行卡
+     * 调用支付服务解绑银行卡，并更新银行卡状态
      * @param reqVo 封装了银行卡id的请求对象
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteBank(CompanyBankCardVo reqVo) {
-        companyBankCardDao.remove(reqVo);
+        CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo,CompanyBankCardVo.class);
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        ObjectHelper.writeWithFrom(companyBankReqVo,bankCardVo);
+        ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("解绑失败，请重试");
+        }
+        companyBankCardDao.remove(bankCardVo);
     }
 
+    /**
+     * 设置该银行卡为默认支付，并取消其他银行卡的默认
+     * @param reqVo 封装了银行卡id的请求对象
+     * @return
+     */
     @Override
     public void setDefault(CompanyBankCardVo reqVo) {
         /*获取该银行卡的公司id*/
@@ -265,9 +422,22 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         getReqVo.setId(reqVo.getId());
         CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
-        String verifyCode = reqVo.getVerifyCode();
+
         /*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
-        return companyBankCardVo;
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
+        companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
+        ResponseResult result = payFeign.bindBack(companyBankReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("绑定银行卡失败，请重试");
+        }
+        CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
+        CompanyBankCardVo companyBankCardVo1 = new CompanyBankCardVo();
+        ObjectHelper.writeWithFrom(companyBankCardVo1,resVo);
+        companyBankCardVo1.setIsDefault(companyBankCardVo.getIsDefault());
+        companyBankCardDao.update(companyBankCardVo1);
+
+        return companyBankCardVo1;
     }
 
     /**y
@@ -308,7 +478,7 @@ public class CompanyServiceImpl implements CompanyService{
                     .replace(":","")
                     .replace(" ","");
         }
-        String select = reqVo.getSelect();
+        int select = reqVo.getSelect();
         /*此处应调用微信接口传入qrCode和select获取qrCodeUrl*/
         return null;
     }
@@ -352,4 +522,60 @@ public class CompanyServiceImpl implements CompanyService{
         }
         return companyVoList;
     }
+
+    /**
+     * 批量删除用户
+     * @param reqVo 封装了用户id列表的请求对象
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchDelete(BatchDeleteReqVo reqVo) {
+        List<String> userIdList = reqVo.getUserIdList();
+        if (null == userIdList || userIdList.isEmpty()){
+            throw new CodeException("删除列表为空，请添加");
+        }
+        for (String userId:userIdList) {
+            UserGetReqVo getReqVo = new UserGetReqVo();
+            getReqVo.setId(userId);
+            userDaoImpl.remove(getReqVo);
+        }
+    }
+
+    /**
+     * 批量更新用户信息
+     * @param reqVo 封装了用户列表的请求对象
+     * @return
+     */
+    @Override
+    public void batchUpdate(BatchUpdateReqVo reqVo) throws Exception {
+        List<UserVo> userVoList = reqVo.getUserVoList();
+        if (null == userVoList || userVoList.isEmpty()){
+            throw new CodeException("更新列表为空，请添加");
+        }
+        for (UserVo userVo:userVoList) {
+            UserGetReqVo getReqVo = new UserGetReqVo();
+            getReqVo.setId(userVo.getId());
+            UserVo userVoOld = userDaoImpl.load(getReqVo,UserVo.class);
+            if (!StringHelper.compare(userVo.getAccount(),userVoOld.getAccount())){
+                userServiceImpl.isValid(userVo.getAccount());
+                userServiceImpl.checkAccount(userVo);
+            }
+            if ("".equals(userVo.getPassword())){
+                userVo.setPassword(userVoOld.getPassword());
+                userVo.setRemark(userVoOld.getRemark());
+            }else{
+                String password = RSAUtils.decryptionByPrivateKey(userVo.getPassword(), RsaConstant.privateKey);
+                userVo.setPassword(StringHelper.md5(password));
+                userVo.setRemark(password);
+            }
+            if (!StringHelper.compare(userVo.getEmail(),userVoOld.getEmail())){
+                userServiceImpl.checkEmail(userVo.getEmail());
+            }
+            if (!StringHelper.compare(userVo.getPhone(),userVoOld.getPhone())){
+                userServiceImpl.checkPhone(userVo);
+            }
+            userDaoImpl.update(userVo);
+        }
+    }
 }

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
+import com.pangding.web.authority.feign.PayFeign;
 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.service.*;
 import com.pangding.web.authority.util.*;
 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.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.util.RSAUtils;
@@ -60,6 +59,10 @@ public class RegisterServiceImpl implements RegisterService {
     RoleAuthorityDao roleAuthorityDaoImpl;
     @Autowired
     AuthorityDao authorityDaoImpl;
+    @Autowired
+    AuthorityService authorityServiceImpl;
+    @Autowired
+    PayFeign payFeign;
 
     /**
      * 判断注册编码是否存在
@@ -144,15 +147,29 @@ public class RegisterServiceImpl implements RegisterService {
 
         this.checkPhone(reqVo.getId(),reqVo.getContactPhone());
 
+        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
+        CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
+        companyGetReqVo.setId(reqVo.getId());
+        CompanyVo company = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
+        CompanyReqVo companyReqVo = new CompanyReqVo();
+        ObjectHelper.writeWithFrom(companyReqVo,reqVo);
+        companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
+        companyReqVo.setStatus(company.getStatus());
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("保存商户失败，请重试");
+        }
+        CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
+
         /*更新公司表*/
         CompanyVo companyVo = new CompanyVo();
-        ObjectHelper.writeWithFrom(companyVo,reqVo);
+        ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);
 
         /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();
-        extendVo.setId(reqVo.getId());
+        extendVo.setId(resCompanyReqVo.getId());
         String qrCode = DateHelper.getNow()
                 .replace("-","")
                 .replace(":","")
@@ -160,8 +177,6 @@ public class RegisterServiceImpl implements RegisterService {
         extendVo.setQrCode(qrCode);
         companyExtendDaoImpl.save(extendVo);
 
-        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
-
         /*跟新用户表添加联系方式*/
         UserVo userReqVo = new UserVo();
         userReqVo.setCompanyId(reqVo.getId());
@@ -187,9 +202,9 @@ public class RegisterServiceImpl implements RegisterService {
 
 
         SaveCompanyResVo resVo = new SaveCompanyResVo();
-        ResponseResult result = storeFeign.merchantCreate(req);
-        if (result.getCode().equals("00")){
-            String merchantId = (String) result.getData();
+        ResponseResult result1 = storeFeign.merchantCreate(req);
+        if (result1.getCode().equals("00")){
+            String merchantId = (String) result1.getData();
             resVo.setMerchantId(merchantId);
         }
 
@@ -212,15 +227,39 @@ public class RegisterServiceImpl implements RegisterService {
 
         this.checkPhone(reqVo.getId(),reqVo.getContactPhone());
 
+        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
+        CompanyReqVo companyReqVo = new CompanyReqVo();
+        ObjectHelper.writeWithFrom(companyReqVo,reqVo);
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
+        companyBankReqVo.setId(StringHelper.getNewID());
+        companyReqVo.getBankList().add(companyBankReqVo);
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("保存商户失败，请重试");
+        }
+        CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
+
         /*更新公司表*/
         CompanyVo companyVo = new CompanyVo();
-        ObjectHelper.writeWithFrom(companyVo,reqVo);
+        ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);
 
+        List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
+        if (null == bankList || bankList.isEmpty()){
+            throw new CodeException("保存商户失败，请重试");
+        }
+
+        /*保存银行卡，并将其设置为默认银行卡*/
+        CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+        ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
+        companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+        companyBankCardDaoImpl.save(companyBankCardVo);
+
         /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();
-        extendVo.setId(reqVo.getId());
+        extendVo.setId(resCompanyReqVo.getId());
         String qrCode = DateHelper.getNow()
                 .replace("-","")
                 .replace(":","")
@@ -230,15 +269,7 @@ public class RegisterServiceImpl implements RegisterService {
 
         SaveCompanyResVo resVo = new SaveCompanyResVo();
 
-        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
 
-        /*保存银行卡，并将其设置为默认银行卡*/
-        CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
-        ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
-        companyBankCardVo.setId(StringHelper.getNewID());
-        companyBankCardVo.setCompanyId(reqVo.getId());
-        companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
-        companyBankCardDaoImpl.save(companyBankCardVo);
 
         /*更新用户信息，保存联系方式*/
         UserVo userReqVo = new UserVo();
@@ -263,9 +294,9 @@ public class RegisterServiceImpl implements RegisterService {
             req.setId(reqVo.getMerchantId());
         }
 
-        ResponseResult result = storeFeign.merchantCreate(req);
-        if (result.getCode().equals("00")){
-            String merchantId = (String) result.getData();
+        ResponseResult result1 = storeFeign.merchantCreate(req);
+        if (result1.getCode().equals("00")){
+            String merchantId = (String) result1.getData();
             resVo.setMerchantId(merchantId);
         }
 
@@ -299,14 +330,14 @@ public class RegisterServiceImpl implements RegisterService {
 
         /*通过私钥将rsa加密的密码解密*/
         String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(),RsaConstant.privateKey);
-        if (!(StringHelper.md5(reqVo.getPassword()).equals(password))){
+        if (!(StringHelper.md5(password).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());
+        resVo.setUserVo(userVo);
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(userVo.getCompanyId());
         CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
@@ -365,20 +396,50 @@ public class RegisterServiceImpl implements RegisterService {
                     authorityIdList.addAll(authorityIds);
                 }
             }
-            List<AuthorityVo> authorityVoList = new ArrayList();
+            List<AuthorityVo> levelOneList = new ArrayList();
             for (String authorityId:authorityIdList) {
                 AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
                 authorityGetReqVo.setId(authorityId);
                 AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
-                authorityVoList.add(authorityVo);
+                if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
+                    levelOneList.add(authorityVo);
+                }
+            }
+            if (null == levelOneList || levelOneList.isEmpty()){
+                throw new CodeException("该用户暂无权限，请添加");
             }
-            resVo.setAuthorityVoList(authorityVoList);
+            List<AuthorityListByLevelResVo> authorityListByLevel = new ArrayList<>();
+            for (AuthorityVo authorityVo:levelOneList) {
+                AuthorityListByLevelResVo resVo1 = new AuthorityListByLevelResVo();
+                ObjectHelper.writeWithFrom(resVo1,authorityVo);
+                List<AuthorityListByLevelResVo> childList = getChildList(authorityVo.getId());
+                resVo1.setChildList(childList);
+                authorityListByLevel.add(resVo1);
+            }
+            resVo.setAuthorityListByLevel(authorityListByLevel);
         }
         loginCompanyResVo.setBankCardCodeList(bankCardCodeList);
         resVo.setCompanyResVo(loginCompanyResVo);
         return resVo;
     }
 
+    private List<AuthorityListByLevelResVo> getChildList(String id){
+        AuthorityGetReqVo reqVo = new AuthorityGetReqVo();
+        reqVo.setPid(id);
+        List<AuthorityVo> childList = authorityDaoImpl.loadList(reqVo,AuthorityVo.class);
+        List<AuthorityListByLevelResVo> childResList = new ArrayList();
+        if (null != childList && !childList.isEmpty()){
+            for (AuthorityVo authorityVo:childList) {
+                AuthorityListByLevelResVo resVo = new AuthorityListByLevelResVo();
+                ObjectHelper.writeWithFrom(resVo,authorityVo);
+                List<AuthorityListByLevelResVo> grandchildList = getChildList(authorityVo.getId());
+                resVo.setChildList(grandchildList);
+                childResList.add(resVo);
+            }
+        }
+        return childResList;
+    }
+
     @Override
     public LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request) throws Exception {
         verifyCodeServiceImpl.validImage(reqVo.getVerifyCode(),session,request);
@@ -397,8 +458,21 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyGetReqVo getReqVo = new CompanyGetReqVo();
         getReqVo.setId(reqVo.getId());
         CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
-        String verifyCode = reqVo.getVerifyCode();
         /*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
+        CompanyReqVo companyReqVo = new CompanyReqVo();
+        ObjectHelper.writeWithFrom(companyReqVo,companyVo);
+        companyReqVo.setValidateCode(reqVo.getVerifyCode());
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("保存商户失败，请重试");
+        }
+        CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
+
+        /*更新公司表*/
+        CompanyVo companyVo1 = new CompanyVo();
+        ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
+        companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyDaoImpl.update(companyVo1);
         return reqVo.getVerifyCode();
     }
 
@@ -412,8 +486,36 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyGetReqVo getReqVo = new CompanyGetReqVo();
         getReqVo.setId(reqVo.getId());
         CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
-        String verifyCode = reqVo.getVerifyCode();
-        /*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
+        /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
+        CompanyReqVo companyReqVo = new CompanyReqVo();
+        ObjectHelper.writeWithFrom(companyReqVo,companyVo);
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
+        companyBankReqVo.setId(StringHelper.getNewID());
+        companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
+        companyReqVo.getBankList().add(companyBankReqVo);
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        if (null == result || !"00".equals(result.getCode())){
+            throw new CodeException("保存商户失败，请重试");
+        }
+        CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
+
+        /*更新公司表*/
+        CompanyVo companyVo1 = new CompanyVo();
+        ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
+        companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyDaoImpl.update(companyVo1);
+
+        List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
+        if (null == bankList || bankList.isEmpty()){
+            throw new CodeException("保存商户失败，请重试");
+        }
+
+        /*保存银行卡，并将其设置为默认银行卡*/
+        CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+        ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
+        companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+        companyBankCardDaoImpl.update(companyBankCardVo);
         return reqVo.getVerifyCode();
     }
 }

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

 package com.pangding.web.authority.service.impl;
 
-import com.pangding.web.authority.dao.RoleDao;
-import com.pangding.web.authority.dao.RoleAuthorityDao;
-import com.pangding.web.authority.dao.AuthorityDao;
-import com.pangding.web.authority.dao.UserRoleDao;
+import com.pangding.web.authority.dao.*;
 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.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -36,6 +34,9 @@ public class RoleServiceImpl implements RoleService {
     @Autowired
     AuthorityDao authorityDaoImpl;
 
+    @Autowired
+    UserDao userDaoImpl;
+
     /**
      * 保存RoleVo对象,并保存角色权限的对应关系
      *
@@ -125,22 +126,6 @@ public class RoleServiceImpl implements RoleService {
         roleDao.checkNameExist(roleVo);
     }
 
-    /**
-     * 获取RoleVo对象列表
-     *
-     * @param req
-     * @return RoleVo对象列表分页对象
-     */
-    @Override
-    public PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req) {
-
-        PageSizeData<RoleVo> roleVoPageSizeData = roleDao.getRoleVoList(req);
-        if (roleVoPageSizeData.getList() == null || roleVoPageSizeData.getList().isEmpty()){
-            throw new CodeException("没有更多权限");
-        }
-        return roleVoPageSizeData;
-    }
-
     /**
      * 获取角色返回信息分页对象
      *
@@ -148,29 +133,58 @@ public class RoleServiceImpl implements RoleService {
      * @return 角色返回信息分页对象
      */
     @Override
-    public PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) {
-        PageSizeData<RoleVo> roleVoPageSizeData = this.getRoleVoList(req);
-        PageSizeData<WebRoleResVo> webRoleResVoPageSizeData = new PageSizeData();
-        List<RoleVo> roleVoList = roleVoPageSizeData.getList();
-        List<WebRoleResVo> webRoleResVoList = new ArrayList(roleVoList.size());
+    public List<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) {
+        List<RoleVo> roleVoList = roleDao.loadList(req,RoleVo.class);
+        List<WebRoleResVo> webRoleResVoList = new ArrayList();
         for (RoleVo roleVo:roleVoList) {
             WebRoleResVo resVo = new WebRoleResVo();
             List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId());
-
+            ObjectHelper.writeWithFrom(resVo,roleVo);
             resVo.setAuthorityList(authorityVoList);
-            resVo.setId(roleVo.getId());
-            resVo.setName(roleVo.getName());
-            resVo.setPid(roleVo.getPid());
-            resVo.setRemark(roleVo.getRemark());
+
+            CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo();
+            countByRoleReqVo.setCompanyId(req.getCompanyId());
+            countByRoleReqVo.setRoleId(roleVo.getId());
+            List<UserVo> userVoList = countByRole(countByRoleReqVo);
+            if (null == userVoList || userVoList.isEmpty()){
+                resVo.setCount(0);
+            }
+            resVo.setCount(userVoList.size());
 
             webRoleResVoList.add(resVo);
         }
-        webRoleResVoPageSizeData.setPageTotal(roleVoPageSizeData.getPageTotal());
-        webRoleResVoPageSizeData.setList(webRoleResVoList);
-        webRoleResVoPageSizeData.setPageIndex(roleVoPageSizeData.getPageIndex());
-        webRoleResVoPageSizeData.setPageSize(roleVoPageSizeData.getPageSize());
 
-        return webRoleResVoPageSizeData;
+        return webRoleResVoList;
+    }
+
+    /**
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
+     */
+    @Override
+    public List<UserVo> countByRole(CountByRoleReqVo reqVo) {
+        UserRoleGetReqVo getReqVo = new UserRoleGetReqVo();
+        getReqVo.setRoleId(reqVo.getRoleId());
+        List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(getReqVo,UserRoleVo.class);
+
+        List<String> userIdList = new ArrayList<>();
+        for (UserRoleVo userRoleVo:userRoleVoList) {
+            userIdList.add(userRoleVo.getUserId());
+        }
+        String companyId = reqVo.getCompanyId();
+        List<UserVo> userVoList = new ArrayList<>();
+        for (String userId:userIdList) {
+            UserGetReqVo userGetReqVo = new UserGetReqVo();
+            userGetReqVo.setId(userId);
+            UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
+            if (null != userVo && companyId.equals(userVo.getCompanyId())){
+                userVo.setPassword("");
+                userVo.setRemark("");
+                userVoList.add(userVo);
+            }
+        }
+        return userVoList;
     }
 
     /**

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

@@ -41,9 +41,14 @@ public class UserServiceImpl implements UserService {
         this.isValid(webUserReqVo.getAccount());
         this.checkAccount(webUserReqVo);
         this.checkPhone(webUserReqVo);
+        this.checkEmail(webUserReqVo.getEmail());
 
         /*将RSA加密后的密码解密*/
         String password = RSAUtils.decryptionByPrivateKey(webUserReqVo.getPassword(), RsaConstant.privateKey);
+        String confirmPassword = RSAUtils.decryptionByPrivateKey(webUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
+        if (!StringHelper.compare(password,confirmPassword)){
+            throw new CodeException("确认密码错误");
+        }
 
         webUserReqVo.setRemark(password);
         String md5Password = this.passwordEncoder(password);
@@ -178,7 +183,15 @@ public class UserServiceImpl implements UserService {
     public void isValid(String account) {
         String regex = "^(?!\\d+$)[\\da-zA-Z]+$";
         if(!account.matches(regex)){
-            throw new CodeException("用户名仅支持字母和数字的组合，且不能为纯数字");
+            throw new CodeException("错误的用户名："+account+",用户名仅支持字母和数字的组合，且不能为纯数字");
+        }
+    }
+
+    @Override
+    public void checkEmail(String email){
+        String regex = "^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$";
+        if (!email.matches(regex)){
+            throw new CodeException("错误的邮箱格式："+email);
         }
     }
 

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

@@ -9,11 +9,11 @@ public class CompanyBankCardConstant {
      * 设置银行卡为默认卡
      * 值：1
      */
-    public static final String IS_DEFAULT = "1";
+    public static final int IS_DEFAULT = 1;
 
     /**
      * 不设置为默认卡
      * 值：0
      */
-    public static final String IS_NOT_DEFAULT = "0";
+    public static final int IS_NOT_DEFAULT = 0;
 }

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

@@ -6,30 +6,30 @@ public class CompanyConstant {
      * 公司类型 个人
      * 值：0
      */
-    public static final String COMPANY_TYPE_PERSON = "0";
+    public static final int COMPANY_TYPE_PERSON = 0;
 
     /**
      * 公司类型 公司
      * 值：1
      */
-    public static final String COMPANY_TYPE_COMPANY = "1";
+    public static final int COMPANY_TYPE_COMPANY = 1;
 
     /**
      * 公司状态 停用
      * 值：12
      */
-    public static final String COMPANY_STATUS_STOP = "12";
+    public static final int COMPANY_STATUS_STOP = 12;
 
     /**
      * 供应商
      * 值：0
      */
-    public static final String PRODUCT = "0";
+    public static final int PRODUCT = 0;
 
     /**
      * 接口商
      * 值：1
      */
-    public static final String INTERFACE = "1";
+    public static final int INTERFACE = 1;
 
 }

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

@@ -7,6 +7,5 @@ import org.springframework.beans.factory.annotation.Value;
  * @create 2019/6/1 15:39
  */
 public class RsaConstant {
-    @Value("${rsa.privatekey}")
-    public static String privateKey;
+    public static final String privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALZh0s9zLNdnF6OxW9R9nHXHewBs0YwTC9cpXVrjHMkrF+p/WLSwQItzwv+rTaEXCZazGxU2uv/IS58YEhG2i6HqwFJDZwgkQ3TimrGXkZ7w5x7JLXoAvIDgJRNJnL2qOPn1nw47DmZ+VsTK3nK/CPtyeJ+QWYgHXxQDcEyv8911AgMBAAECgYAyLaHhf4+zx+JiIBbi1JhqczKtQEM65baZQQE1U00FL/0JgHX4aJGpjHT3ALt/+aWit65Y3NEANKxRnj7CbtXlhG65zWGfZXoieqFlOxRFcHIWRpEFCtlnflGY1Os0n6dJ335YDWKuxbvq4TiLs6WIG8rIdD6tK1x49VNdukX+dQJBAOPX/rrQHjUuVK6kidhgbZXAjqRfQri50rFOxmvZvfpO+Fn7AuSA5NxXLj+7Jf/5SPJBXP5OhEiNIhh3qnoy1UcCQQDM653qBdR3KR3ro89mzc0RKJjooZVttqHc/FV9vd2dUPYGk0h94mSB2+ofsoOIZYa5eh0lDyBISbofnKjjVwVjAkA70HeSKZLUmU4n7xA1GtOKDdwksNF+V2JFpA2ZQLeMH/E5BhmzTVdHtSdyGbqXIaWR27EDHi/CMDL0Q24g2Hl/AkBP87YfMrsc6vvzjmxDbhSOl0phqXnF3rX0pLcuYj/vO0Fie2CTTRtt10HXsCzFsOcJwu1QIkC0M5/c6aCzYqaFAkBOaY9LoJXr2Fjga4XXWxE0oRvjCaV0p/dKTRAzXKdgqc6ADXc/OiAPr4nH48vnPH2w30nk17CR0WeMqhhgpMtM";
 }

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

@@ -22,14 +22,14 @@ public class AuthorityVo extends BaseVo implements InitDao {
 
     private String name;
 
-    private String type;
+    private int type;
 
     private String alias;
 
     private String url;
 
     @TableAnnotation("open_mode")
-    private String openMode;
+    private int openMode;
 
     private String remark;
 
@@ -37,13 +37,13 @@ public class AuthorityVo extends BaseVo implements InitDao {
 
     private String createTime;
 
-    private String sort;
+    private int sort;
 
-    public String getSort() {
+    public int getSort() {
         return sort;
     }
 
-    public void setSort(String sort) {
+    public void setSort(int sort) {
         this.sort = sort;
     }
 
@@ -71,11 +71,11 @@ public class AuthorityVo extends BaseVo implements InitDao {
         this.name = name;
     }
 
-    public String getType() {
+    public int getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(int type) {
         this.type = type;
     }
 
@@ -95,11 +95,11 @@ public class AuthorityVo extends BaseVo implements InitDao {
         this.url = url;
     }
 
-    public String getOpenMode() {
+    public int getOpenMode() {
         return openMode;
     }
 
-    public void setOpenMode(String openMode) {
+    public void setOpenMode(int openMode) {
         this.openMode = openMode;
     }
 

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

@@ -25,7 +25,7 @@ public class CompanyBankCardVo extends BaseVo {
     @TableAnnotation("bank_code")
     private String bankCode;
 
-    private String type;
+    private int type;
 
     @TableAnnotation("company_id")
     private String companyId;
@@ -36,9 +36,9 @@ public class CompanyBankCardVo extends BaseVo {
     private String idCard;
 
     @TableAnnotation("reserved_phone")
-    private String reservedPhone;
+    private String phone;
 
-    private String status;
+    private int status;
 
     @TableAnnotation("binding_code")
     private String bindingCode;
@@ -47,13 +47,13 @@ public class CompanyBankCardVo extends BaseVo {
     private String bindingTime;
 
     @TableAnnotation("is_default")
-    private String isDefault;
+    private int isDefault;
 
-    public String getIsDefault() {
+    public int getIsDefault() {
         return isDefault;
     }
 
-    public void setIsDefault(String isDefault) {
+    public void setIsDefault(int isDefault) {
         this.isDefault = isDefault;
     }
 
@@ -97,11 +97,11 @@ public class CompanyBankCardVo extends BaseVo {
         this.bankCode = bankCode;
     }
 
-    public String getType() {
+    public int getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(int type) {
         this.type = type;
     }
 
@@ -129,19 +129,19 @@ public class CompanyBankCardVo extends BaseVo {
         this.idCard = idCard;
     }
 
-    public String getReservedPhone() {
-        return reservedPhone;
+    public String getPhone() {
+        return phone;
     }
 
-    public void setReservedPhone(String reservedPhone) {
-        this.reservedPhone = reservedPhone;
+    public void setPhone(String phone) {
+        this.phone = phone;
     }
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 

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

@@ -18,7 +18,7 @@ public class CompanyExtendVo extends BaseVo {
     private String qrCode;
 
     @TableAnnotation("QR_code_type")
-    private String qrCodeType;
+    private int qrCodeType;
 
     @TableAnnotation("QR_code_url")
     private String qrCodeUrl;
@@ -27,7 +27,7 @@ public class CompanyExtendVo extends BaseVo {
      * 是否分账
      */
     @TableAnnotation("subledger_status")
-    private String subledgerStatus;
+    private int subledgerStatus;
 
     /**
      * 分账规则
@@ -39,7 +39,7 @@ public class CompanyExtendVo extends BaseVo {
      * 是否分润
      */
     @TableAnnotation("divide_status")
-    private String divedeStatus;
+    private int divedeStatus;
 
     /**
      * 分润规则
@@ -51,7 +51,7 @@ public class CompanyExtendVo extends BaseVo {
      * 是够可提现
      */
     @TableAnnotation("withdraw_status")
-    private String withdrawStatus;
+    private int withdrawStatus;
 
     /**
      * 提现规则
@@ -69,7 +69,7 @@ public class CompanyExtendVo extends BaseVo {
      * 是否扫码支付
      */
     @TableAnnotation("scan_code_pay_status")
-    private String scanCodePayStatus;
+    private int scanCodePayStatus;
 
     /**
      * 支付规则
@@ -81,7 +81,7 @@ public class CompanyExtendVo extends BaseVo {
      * 是否邀请
      */
     @TableAnnotation("invitation_status")
-    private String invitationStatus;
+    private int invitationStatus;
 
     /**
      * 邀请规则
@@ -116,11 +116,11 @@ public class CompanyExtendVo extends BaseVo {
         this.qrCode = qrCode;
     }
 
-    public String getQrCodeType() {
+    public int getQrCodeType() {
         return qrCodeType;
     }
 
-    public void setQrCodeType(String qrCodeType) {
+    public void setQrCodeType(int qrCodeType) {
         this.qrCodeType = qrCodeType;
     }
 
@@ -132,11 +132,11 @@ public class CompanyExtendVo extends BaseVo {
         this.qrCodeUrl = qrCodeUrl;
     }
 
-    public String getSubledgerStatus() {
+    public int getSubledgerStatus() {
         return subledgerStatus;
     }
 
-    public void setSubledgerStatus(String subledgerStatus) {
+    public void setSubledgerStatus(int subledgerStatus) {
         this.subledgerStatus = subledgerStatus;
     }
 
@@ -148,11 +148,11 @@ public class CompanyExtendVo extends BaseVo {
         this.subledgerRuleId = subledgerRuleId;
     }
 
-    public String getDivedeStatus() {
+    public int getDivedeStatus() {
         return divedeStatus;
     }
 
-    public void setDivedeStatus(String divedeStatus) {
+    public void setDivedeStatus(int divedeStatus) {
         this.divedeStatus = divedeStatus;
     }
 
@@ -164,11 +164,11 @@ public class CompanyExtendVo extends BaseVo {
         this.divideRuleId = divideRuleId;
     }
 
-    public String getWithdrawStatus() {
+    public int getWithdrawStatus() {
         return withdrawStatus;
     }
 
-    public void setWithdrawStatus(String withdrawStatus) {
+    public void setWithdrawStatus(int withdrawStatus) {
         this.withdrawStatus = withdrawStatus;
     }
 
@@ -180,11 +180,11 @@ public class CompanyExtendVo extends BaseVo {
         this.withdrawRuleId = withdrawRuleId;
     }
 
-    public String getScanCodePayStatus() {
+    public int getScanCodePayStatus() {
         return scanCodePayStatus;
     }
 
-    public void setScanCodePayStatus(String scanCodePayStatus) {
+    public void setScanCodePayStatus(int scanCodePayStatus) {
         this.scanCodePayStatus = scanCodePayStatus;
     }
 
@@ -196,11 +196,11 @@ public class CompanyExtendVo extends BaseVo {
         this.payRuleId = payRuleId;
     }
 
-    public String getInvitationStatus() {
+    public int getInvitationStatus() {
         return invitationStatus;
     }
 
-    public void setInvitationStatus(String invitationStatus) {
+    public void setInvitationStatus(int invitationStatus) {
         this.invitationStatus = invitationStatus;
     }
 

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

@@ -27,7 +27,7 @@ public class CompanyVo extends BaseVo implements InitDao {
     private String companyName;
 
     @TableAnnotation("company_type")
-    private String companyType;
+    private int companyType;
 
     @TableAnnotation("business_license_code")
     private String businessLicenseCode;
@@ -35,7 +35,7 @@ public class CompanyVo extends BaseVo implements InitDao {
     private String address;
 
     @TableAnnotation("company_attribute")
-    private String companyAttribute;
+    private int companyAttribute;
 
     @TableAnnotation("contact_name")
     private String contactName;
@@ -50,9 +50,9 @@ public class CompanyVo extends BaseVo implements InitDao {
     private String electromicAgreementCode;
 
     @TableAnnotation("signing_status")
-    private String signingStatus;
+    private int signingStatus;
 
-    private String status;
+    private int status;
 
     @TableAnnotation("create_time")
     private String createTime;
@@ -60,16 +60,16 @@ public class CompanyVo extends BaseVo implements InitDao {
     @TableAnnotation("update_time")
     private String updateTime;
 
-    private String nature;
+    private int nature;
 
     @TableAnnotation("product_or_interface")
-    private String productOrInterface;
+    private int productOrInterface;
 
-    public String getProductOrInterface() {
+    public int getProductOrInterface() {
         return productOrInterface;
     }
 
-    public void setProductOrInterface(String productOrInterface) {
+    public void setProductOrInterface(int productOrInterface) {
         this.productOrInterface = productOrInterface;
     }
 
@@ -105,11 +105,11 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.companyName = companyName;
     }
 
-    public String getCompanyType() {
+    public int getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
+    public void setCompanyType(int companyType) {
         this.companyType = companyType;
     }
 
@@ -129,11 +129,11 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.address = address;
     }
 
-    public String getCompanyAttribute() {
+    public int getCompanyAttribute() {
         return companyAttribute;
     }
 
-    public void setCompanyAttribute(String companyAttribute) {
+    public void setCompanyAttribute(int companyAttribute) {
         this.companyAttribute = companyAttribute;
     }
 
@@ -169,19 +169,19 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.electromicAgreementCode = electromicAgreementCode;
     }
 
-    public String getSigningStatus() {
+    public int getSigningStatus() {
         return signingStatus;
     }
 
-    public void setSigningStatus(String signingStatus) {
+    public void setSigningStatus(int signingStatus) {
         this.signingStatus = signingStatus;
     }
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 
@@ -201,18 +201,16 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.updateTime = updateTime;
     }
 
-    public String getNature() {
+    public int getNature() {
         return nature;
     }
 
-    public void setNature(String nature) {
+    public void setNature(int nature) {
         this.nature = nature;
     }
 
     @Override
     public void init() {
         this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
-        this.status = StringHelper.getFirst(this.status, "0");
-        this.companyAttribute = StringHelper.getFirst(this.companyAttribute,"0");
     }
 }

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

@@ -60,7 +60,7 @@ public class Merchant extends BaseVo {
     /**
      * 类型（1：景区；2：餐饮；3：酒店）
      */
-    private String type;
+    private int type;
 
     /**
      * 标签
@@ -215,11 +215,11 @@ public class Merchant extends BaseVo {
         this.address = address;
     }
 
-    public String getType() {
+    public int getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(int type) {
         this.type = type;
     }
 

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

@@ -24,7 +24,7 @@ public class UserVo extends BaseVo implements InitDao {
 
     private String phone;
 
-    private String status;
+    private int status;
 
     private String remark;
 
@@ -40,6 +40,26 @@ public class UserVo extends BaseVo implements InitDao {
     @TableAnnotation("company_id")
     private String companyId;
 
+    private String name;
+
+    private String email;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
     public String getId() {
         return id;
     }
@@ -72,11 +92,11 @@ public class UserVo extends BaseVo implements InitDao {
         this.phone = phone;
     }
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 

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.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 
 import java.util.List;
@@ -12,20 +13,20 @@ import java.util.List;
 public class LoginResVo {
     private String token;
 
-    private String account;
+    private UserVo userVo;
 
     private String code;
 
     private LoginCompanyResVo companyResVo;
 
-    private List<AuthorityVo> authorityVoList;
+    private List<AuthorityListByLevelResVo> authorityListByLevel;
 
-    public List<AuthorityVo> getAuthorityVoList() {
-        return authorityVoList;
+    public List<AuthorityListByLevelResVo> getAuthorityListByLevel() {
+        return authorityListByLevel;
     }
 
-    public void setAuthorityVoList(List<AuthorityVo> authorityVoList) {
-        this.authorityVoList = authorityVoList;
+    public void setAuthorityListByLevel(List<AuthorityListByLevelResVo> authorityListByLevel) {
+        this.authorityListByLevel = authorityListByLevel;
     }
 
     public String getCode() {
@@ -44,12 +45,12 @@ public class LoginResVo {
         this.token = token;
     }
 
-    public String getAccount() {
-        return account;
+    public UserVo getUserVo() {
+        return userVo;
     }
 
-    public void setAccount(String account) {
-        this.account = account;
+    public void setUserVo(UserVo userVo) {
+        this.userVo = userVo;
     }
 
     public LoginCompanyResVo getCompanyResVo() {

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

@@ -10,7 +10,7 @@ public class AuthorityGetReqVo {
 
     private String pid;
 
-    private String sort;
+    private int sort;
 
     public String getReqId() {
         return reqId;
@@ -20,11 +20,11 @@ public class AuthorityGetReqVo {
         this.reqId = reqId;
     }
 
-    public String getSort() {
+    public int getSort() {
         return sort;
     }
 
-    public void setSort(String sort) {
+    public void setSort(int sort) {
         this.sort = sort;
     }
 

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

+package com.pangding.web.authority.vo.reqvo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/4 15:05
+ */
+public class BatchDeleteReqVo {
+    private String reqId;
+
+    private List<String> userIdList;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public List<String> getUserIdList() {
+        return userIdList;
+    }
+
+    public void setUserIdList(List<String> userIdList) {
+        this.userIdList = userIdList;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+import com.pangding.web.authority.vo.UserVo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/4 15:14
+ */
+public class BatchUpdateReqVo {
+    private String reqId;
+
+    private List<UserVo> userVoList;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public List<UserVo> getUserVoList() {
+        return userVoList;
+    }
+
+    public void setUserVoList(List<UserVo> userVoList) {
+        this.userVoList = userVoList;
+    }
+}

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

-package com.pangding.web.authority.vo.reqvo;
-
-import com.pangding.web.authority.vo.CompanyVo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/23 18:06
- */
-public class CompanyAndCompanyExtendSaveReqVo extends CompanyVo {
-    private String reqId;
-
-    private String qrCode;
-
-    private String qrCodeType;
-
-    private String qrCodeUrl;
-
-    private String isSubAccount;
-
-    private String subAccountRule;
-
-    private String isSubProfit;
-
-    private String subProfitRule;
-
-    private String isWithdraw;
-
-    private String withdrawRule;
-
-    private String isScanCodePay;
-
-    private String payRule;
-
-    private String isInvitate;
-
-    private String invitateRule;
-
-    private String invitationCode;
-
-    public String getReqId() {
-        return reqId;
-    }
-
-    public void setReqId(String reqId) {
-        this.reqId = reqId;
-    }
-
-    public String getQrCode() {
-        return qrCode;
-    }
-
-    public void setQrCode(String qrCode) {
-        this.qrCode = qrCode;
-    }
-
-    public String getQrCodeType() {
-        return qrCodeType;
-    }
-
-    public void setQrCodeType(String qrCodeType) {
-        this.qrCodeType = qrCodeType;
-    }
-
-    public String getQrCodeUrl() {
-        return qrCodeUrl;
-    }
-
-    public void setQrCodeUrl(String qrCodeUrl) {
-        this.qrCodeUrl = qrCodeUrl;
-    }
-
-    public String getIsSubAccount() {
-        return isSubAccount;
-    }
-
-    public void setIsSubAccount(String isSubAccount) {
-        this.isSubAccount = isSubAccount;
-    }
-
-    public String getSubAccountRule() {
-        return subAccountRule;
-    }
-
-    public void setSubAccountRule(String subAccountRule) {
-        this.subAccountRule = subAccountRule;
-    }
-
-    public String getIsSubProfit() {
-        return isSubProfit;
-    }
-
-    public void setIsSubProfit(String isSubProfit) {
-        this.isSubProfit = isSubProfit;
-    }
-
-    public String getSubProfitRule() {
-        return subProfitRule;
-    }
-
-    public void setSubProfitRule(String subProfitRule) {
-        this.subProfitRule = subProfitRule;
-    }
-
-    public String getIsWithdraw() {
-        return isWithdraw;
-    }
-
-    public void setIsWithdraw(String isWithdraw) {
-        this.isWithdraw = isWithdraw;
-    }
-
-    public String getWithdrawRule() {
-        return withdrawRule;
-    }
-
-    public void setWithdrawRule(String withdrawRule) {
-        this.withdrawRule = withdrawRule;
-    }
-
-    public String getIsScanCodePay() {
-        return isScanCodePay;
-    }
-
-    public void setIsScanCodePay(String isScanCodePay) {
-        this.isScanCodePay = isScanCodePay;
-    }
-
-    public String getPayRule() {
-        return payRule;
-    }
-
-    public void setPayRule(String payRule) {
-        this.payRule = payRule;
-    }
-
-    public String getIsInvitate() {
-        return isInvitate;
-    }
-
-    public void setIsInvitate(String isInvitate) {
-        this.isInvitate = isInvitate;
-    }
-
-    public String getInvitateRule() {
-        return invitateRule;
-    }
-
-    public void setInvitateRule(String invitateRule) {
-        this.invitateRule = invitateRule;
-    }
-
-    public String getInvitationCode() {
-        return invitationCode;
-    }
-
-    public void setInvitationCode(String invitationCode) {
-        this.invitationCode = invitationCode;
-    }
-}

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/2 18:12
+ */
+public class CompanyBankReqVo {
+    /**
+     * 银行卡id
+     */
+    private String id;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCardCode;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 银行地址
+     */
+    private String bankAddress;
+
+    /**
+     * 银行行号
+     */
+    private String bankCode;
+
+    /**
+     * 类型 公司 个人
+     */
+    private String type;
+
+    /**
+     * 公司id
+     */
+    private String companyId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 状态
+     */
+    private int status;
+
+    /**
+     * 绑定编号
+     */
+    private String bindingCode;
+
+    /**
+     * 绑定时间
+     */
+    private String bindingTime;
+
+    /**
+     * 验证码
+     */
+    private String validateCode;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBankCardCode() {
+        return bankCardCode;
+    }
+
+    public void setBankCardCode(String bankCardCode) {
+        this.bankCardCode = bankCardCode;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getBindingCode() {
+        return bindingCode;
+    }
+
+    public void setBindingCode(String bindingCode) {
+        this.bindingCode = bindingCode;
+    }
+
+    public String getBindingTime() {
+        return bindingTime;
+    }
+
+    public void setBindingTime(String bindingTime) {
+        this.bindingTime = bindingTime;
+    }
+
+    public String getValidateCode() {
+        return validateCode;
+    }
+
+    public void setValidateCode(String validateCode) {
+        this.validateCode = validateCode;
+    }
+}

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

@@ -9,15 +9,15 @@ public class CompanyGetReqVo {
 
     private String id;
 
-    private String productOrInterface;
+    private int productOrInterface;
 
     private String companyName;
 
-    public String getProductOrInterface() {
+    public int getProductOrInterface() {
         return productOrInterface;
     }
 
-    public void setProductOrInterface(String productOrInterface) {
+    public void setProductOrInterface(int productOrInterface) {
         this.productOrInterface = productOrInterface;
     }
 

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

+package com.pangding.web.authority.vo.reqvo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/2 18:10
+ */
+public class CompanyReqVo {
+    /**
+     * 公司id
+     */
+    private String id;
+
+    /**
+     * 上级公司id
+     */
+    private String pid;
+
+    /**
+     * 邀请公司id
+     */
+    private String invitationCompanyId;
+
+    /**
+     * 通联会员id
+     */
+    private String thirdId;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 公司性质 0:其他，1:集团，2:公司，3:个人，4:行政机构
+     */
+    private int nature;
+
+    /**
+     * 公司类型 1公司，0个人
+     */
+    private int companyType;
+
+    /**
+     * 营业执照号
+     */
+    private String businessLicenseCode;
+
+    /**
+     * 公司地址
+     */
+    private String address;
+
+    /**
+     * 公司行业属性0:其他;1:景区；2:酒店；3:餐饮；4:特产；5:运营车
+     */
+    private int companyAttribution;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    private String contactPhone;
+
+    /**
+     * 联系人身份证
+     */
+    private String contactCode;
+
+    /**
+     * 电子签约协议号
+     */
+    private String electronicAgreementCode;
+
+    /**
+     * 签约状态
+     */
+    private int signingStatus;
+
+    /**
+     * 公司状态0初始化状态，1创建会员成功，2绑定手机，3企业实名认证成功，
+     4绑定支付密码，5公司实名认证中，6公司实名认证错误，
+     7设置支付密码中，8电子签约中，9电子签约错误，
+     10电子签约成功，11绑定手机发送验证码中
+     */
+    private int status;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
+    /**
+     * 验证码
+     */
+    private String validateCode;
+
+    /**
+     * 银行卡列表
+     */
+    private List<CompanyBankReqVo> bankList;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getInvitationCompanyId() {
+        return invitationCompanyId;
+    }
+
+    public void setInvitationCompanyId(String invitationCompanyId) {
+        this.invitationCompanyId = invitationCompanyId;
+    }
+
+    public String getThirdId() {
+        return thirdId;
+    }
+
+    public void setThirdId(String thirdId) {
+        this.thirdId = thirdId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public int getNature() {
+        return nature;
+    }
+
+    public void setNature(int nature) {
+        this.nature = nature;
+    }
+
+    public int getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(int companyType) {
+        this.companyType = companyType;
+    }
+
+    public String getBusinessLicenseCode() {
+        return businessLicenseCode;
+    }
+
+    public void setBusinessLicenseCode(String businessLicenseCode) {
+        this.businessLicenseCode = businessLicenseCode;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public int getCompanyAttribution() {
+        return companyAttribution;
+    }
+
+    public void setCompanyAttribution(int companyAttribution) {
+        this.companyAttribution = companyAttribution;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getContactCode() {
+        return contactCode;
+    }
+
+    public void setContactCode(String contactCode) {
+        this.contactCode = contactCode;
+    }
+
+    public String getElectronicAgreementCode() {
+        return electronicAgreementCode;
+    }
+
+    public void setElectronicAgreementCode(String electronicAgreementCode) {
+        this.electronicAgreementCode = electronicAgreementCode;
+    }
+
+    public int getSigningStatus() {
+        return signingStatus;
+    }
+
+    public void setSigningStatus(int signingStatus) {
+        this.signingStatus = signingStatus;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public List<CompanyBankReqVo> getBankList() {
+        return bankList;
+    }
+
+    public void setBankList(List<CompanyBankReqVo> bankList) {
+        this.bankList = bankList;
+    }
+
+    public String getValidateCode() {
+        return validateCode;
+    }
+
+    public void setValidateCode(String validateCode) {
+        this.validateCode = validateCode;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/4 11:40
+ */
+public class CompanyScenicInfoReqVo extends BaseVo {
+
+    /**
+     * 请求编号
+     */
+    private String reqId;
+    /**
+     * 公司编号
+     */
+    private String companyId;
+    /**
+     * 接口商还是供应商
+     */
+    private int productOrInterface;
+
+    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;
+    }
+
+    public int getProductOrInterface() {
+        return productOrInterface;
+    }
+
+    public void setProductOrInterface(int productOrInterface) {
+        this.productOrInterface = productOrInterface;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/4 18:51
+ */
+public class CompanySubmitReqVo {
+    private String reqId;
+
+    private String companyId;
+
+    private String verifyCode;
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    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/ComputerLoginReqVo.java

@@ -9,7 +9,7 @@ import com.pangding.web.authority.vo.LoginVo;
 public class ComputerLoginReqVo extends LoginVo {
     private String reqId;
 
-    private String accountOrPhone;
+    private int accountOrPhone;
 
     private String password;
 
@@ -23,11 +23,11 @@ public class ComputerLoginReqVo extends LoginVo {
         this.reqId = reqId;
     }
 
-    public String getAccountOrPhone() {
+    public int getAccountOrPhone() {
         return accountOrPhone;
     }
 
-    public void setAccountOrPhone(String accountOrPhone) {
+    public void setAccountOrPhone(int accountOrPhone) {
         this.accountOrPhone = accountOrPhone;
     }
 

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/3 15:50
+ */
+public class CountByRoleReqVo {
+    private String reqId;
+
+    private String roleId;
+
+    private String companyId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}

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

@@ -9,7 +9,7 @@ public class GenerateQrCodeUrlReqVo {
 
     private String companyId;
 
-    private String select;
+    private int select;
 
     public String getReqId() {
         return reqId;
@@ -27,11 +27,11 @@ public class GenerateQrCodeUrlReqVo {
         this.companyId = companyId;
     }
 
-    public String getSelect() {
+    public int getSelect() {
         return select;
     }
 
-    public void setSelect(String select) {
+    public void setSelect(int select) {
         this.select = select;
     }
 }

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

 package com.pangding.web.authority.vo.reqvo;
 
-import com.yanzuoguang.util.vo.PageSizeReqVo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/15 17:54
  */
-public class ListRoleReqVo extends PageSizeReqVo {
+public class ListRoleReqVo {
     private String reqId;
 
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
     public String getReqId() {
         return reqId;
     }

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

@@ -7,7 +7,7 @@ package com.pangding.web.authority.vo.reqvo;
 public class ProductOrInterfaceReqVo {
     private String reqId;
 
-    private String productOrInterface;
+    private int productOrInterface;
 
     private String companyName;
 
@@ -19,11 +19,11 @@ public class ProductOrInterfaceReqVo {
         this.reqId = reqId;
     }
 
-    public String getProductOrInterface() {
+    public int getProductOrInterface() {
         return productOrInterface;
     }
 
-    public void setProductOrInterface(String productOrInterface) {
+    public void setProductOrInterface(int productOrInterface) {
         this.productOrInterface = productOrInterface;
     }
 

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

@@ -11,7 +11,7 @@ public class RegisterEnterpriceReqVo {
 
     private String invitationCompanyId;
 
-    private String companyType;
+    private int companyType;
 
     private String companyName;
 
@@ -21,7 +21,7 @@ public class RegisterEnterpriceReqVo {
 
     private String merchantName;
 
-    private String companyAttribute;
+    private int companyAttribute;
 
     private String contactName;
 
@@ -73,11 +73,11 @@ public class RegisterEnterpriceReqVo {
         this.invitationCompanyId = invitationCompanyId;
     }
 
-    public String getCompanyType() {
+    public int getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
+    public void setCompanyType(int companyType) {
         this.companyType = companyType;
     }
 
@@ -113,11 +113,11 @@ public class RegisterEnterpriceReqVo {
         this.merchantName = merchantName;
     }
 
-    public String getCompanyAttribute() {
+    public int getCompanyAttribute() {
         return companyAttribute;
     }
 
-    public void setCompanyAttribute(String companyAttribute) {
+    public void setCompanyAttribute(int companyAttribute) {
         this.companyAttribute = companyAttribute;
     }
 

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

@@ -9,15 +9,17 @@ public class RegisterIndividualReqVo {
 
     private String id;
 
+    private String pid;
+
     private String invitationCompanyId;
 
-    private String companyType;
+    private int companyType;
 
     private String companyName;
 
     private String address;
 
-    private String companyAttribute;
+    private int companyAttribute;
 
     private String businessLicenseCode;
 
@@ -29,6 +31,14 @@ public class RegisterIndividualReqVo {
 
     private String merchantId;
 
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
     public String getMerchantId() {
         return merchantId;
     }
@@ -61,11 +71,11 @@ public class RegisterIndividualReqVo {
         this.invitationCompanyId = invitationCompanyId;
     }
 
-    public String getCompanyType() {
+    public int getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
+    public void setCompanyType(int companyType) {
         this.companyType = companyType;
     }
 
@@ -85,11 +95,11 @@ public class RegisterIndividualReqVo {
         this.address = address;
     }
 
-    public String getCompanyAttribute() {
+    public int getCompanyAttribute() {
         return companyAttribute;
     }
 
-    public void setCompanyAttribute(String companyAttribute) {
+    public void setCompanyAttribute(int companyAttribute) {
         this.companyAttribute = companyAttribute;
     }
 

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

@@ -14,7 +14,7 @@ public class RegisterUserReqVo {
 
     private String confirmPassword;
 
-    private String companyType;
+    private int companyType;
 
     private String invitationCode;
 
@@ -50,11 +50,11 @@ public class RegisterUserReqVo {
         this.password = password;
     }
 
-    public String getCompanyType() {
+    public int getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
+    public void setCompanyType(int companyType) {
         this.companyType = companyType;
     }
 

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/4 16:52
+ */
+public class SaveCompanyReqVo {
+    private String reqId;
+
+    /**
+     * 用户名
+     */
+    private String account;
+
+    /**
+     * 用户类型
+     */
+    private int companyType;
+
+    /**
+     * 行业属性
+     */
+    private int companyAttribute;
+
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+
+    /**
+     * 商户地址
+     */
+    private String merchantAddress;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 企业地址
+     */
+    private String companyAddress;
+
+    /**
+     * 营业执照号
+     */
+    private String businessLicenseCode;
+
+    /**
+     * 法人姓名
+     */
+    private String contactName;
+
+    /**
+     * 身份证号
+     */
+    private String contactCode;
+
+    /**
+     * 电话
+     */
+    private String contactPhone;
+
+    /**
+     * 开户银行
+     */
+    private String bankName;
+
+    /**
+     * 开户地址
+     */
+    private String bankAddress;
+
+    /**
+     * 开户账号
+     */
+    private String bankCardCode;
+
+    /**
+     * 开户行号
+     */
+    private String bankCode;
+
+    /**
+     * 创建者id
+     */
+    private String createId;
+
+    /**
+     * 创建人
+     */
+    private String createName;
+
+    public String getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public int getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(int companyType) {
+        this.companyType = companyType;
+    }
+
+    public int getCompanyAttribute() {
+        return companyAttribute;
+    }
+
+    public void setCompanyAttribute(int companyAttribute) {
+        this.companyAttribute = companyAttribute;
+    }
+
+    public String getMerchantName() {
+        return merchantName;
+    }
+
+    public void setMerchantName(String merchantName) {
+        this.merchantName = merchantName;
+    }
+
+    public String getMerchantAddress() {
+        return merchantAddress;
+    }
+
+    public void setMerchantAddress(String merchantAddress) {
+        this.merchantAddress = merchantAddress;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+    }
+
+    public String getBusinessLicenseCode() {
+        return businessLicenseCode;
+    }
+
+    public void setBusinessLicenseCode(String businessLicenseCode) {
+        this.businessLicenseCode = businessLicenseCode;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactCode() {
+        return contactCode;
+    }
+
+    public void setContactCode(String contactCode) {
+        this.contactCode = contactCode;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankCardCode() {
+        return bankCardCode;
+    }
+
+    public void setBankCardCode(String bankCardCode) {
+        this.bankCardCode = bankCardCode;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+}

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

@@ -10,8 +10,18 @@ import java.util.List;
 public class WebUserReqVo extends UserVo {
     private String reqId;
 
+    private String confirmPassword;
+
     private List<String> roleIds;
 
+    public String getConfirmPassword() {
+        return confirmPassword;
+    }
+
+    public void setConfirmPassword(String confirmPassword) {
+        this.confirmPassword = confirmPassword;
+    }
+
     public String getReqId() {
         return reqId;
     }

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

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.CompanyBankCardVo;
-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.*;
 
 import java.util.List;
 
@@ -16,10 +13,20 @@ public class CompanyResVo {
 
     private CompanyVo companyVo;
 
+    private Merchant merchant;
+
     private CompanyExtendVo companyExtendVo;
 
     private List<CompanyBankCardVo> bankCardVoList;
 
+    public Merchant getMerchant() {
+        return merchant;
+    }
+
+    public void setMerchant(Merchant merchant) {
+        this.merchant = merchant;
+    }
+
     public List<UserVo> getUserVoList() {
         return userVoList;
     }

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

@@ -9,17 +9,17 @@ import java.util.List;
 public class LoginCompanyResVo {
     private String id;
 
-    private String status;
+    private int status;
 
-    private String companyAttribute;
+    private int companyAttribute;
 
     private List<String> bankCardCodeList;
 
-    public String getCompanyAttribute() {
+    public int getCompanyAttribute() {
         return companyAttribute;
     }
 
-    public void setCompanyAttribute(String companyAttribute) {
+    public void setCompanyAttribute(int companyAttribute) {
         this.companyAttribute = companyAttribute;
     }
 
@@ -31,11 +31,11 @@ public class LoginCompanyResVo {
         this.id = id;
     }
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.RoleVo;
+import com.pangding.web.authority.vo.UserVo;
 
 import java.util.List;
 
@@ -12,6 +13,16 @@ public class WebRoleResVo extends RoleVo {
 
     private List<AuthorityVo> authorityList;
 
+    private int count;
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
     public List<AuthorityVo> getAuthorityList() {
         return authorityList;
     }