user/role/tright 6.6

还需要调用其他服务

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

@@ -29,6 +29,52 @@ public class CompanyManagementController {
     @Autowired
     CompanyService companyServiceImpl;
 
+    /**y
+     * 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
+     * @param reqVo 公司以及公司扩展表信息
+     * @return 公司信息
+     */
+    @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
+        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
+    }
+
+    private void checkCompany(SaveCompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("account",reqVo.getAccount())
+                .notBlankCheck("companyType",reqVo.getCompanyType())
+                .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("contactCode",reqVo.getContactCode())
+                .checkIdCard("contactCode",reqVo.getContactCode())
+                .notBlankCheck("contactPhone",reqVo.getContactPhone())
+                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
+                .checkException();
+    }
+
+
+    /**
+     * 添加公司提交按钮
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult companySubmit(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .notBlankCheck("verifyCode",reqVo.getVerifyCode())
+                .checkException();
+        companyServiceImpl.companySubmit(reqVo);
+        return new ResponseResult();
+    }
+
     /**y
      * 商户查看详情，根据公司id返回用户信息和公司主表信息
      * @param reqVo 包含公司id的请求对象
@@ -61,12 +107,12 @@ public class CompanyManagementController {
      * @return 二维码url
      */
     @RequestMapping(value = "/generateQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
+    public Object generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .notBlankCheck("select",reqVo.getSelect())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));
+        return companyServiceImpl.generateQrCodeUrl(reqVo);
     }
 
     /**y
@@ -202,4 +248,17 @@ public class CompanyManagementController {
         companyServiceImpl.batchUpdate(reqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<CompanyVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.myInvite(reqVo));
+    }
 }

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

@@ -67,6 +67,11 @@ public class PangdingManagementController {
      */
     @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
+        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
+    }
+
+    private void checkCompany(SaveCompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("account",reqVo.getAccount())
                 .notBlankCheck("companyType",reqVo.getCompanyType())
@@ -82,7 +87,6 @@ public class PangdingManagementController {
                 .notBlankCheck("contactPhone",reqVo.getContactPhone())
                 .checkPhoneNo("contactPhone",reqVo.getContactPhone())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
     }
 
 
@@ -92,7 +96,8 @@ public class PangdingManagementController {
      * @return
      */
     @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult companySubmit(@RequestBody CompanySubmitReqVo reqVo){
+    public ResponseResult companySubmit(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .notBlankCheck("verifyCode",reqVo.getVerifyCode())
@@ -258,4 +263,17 @@ public class PangdingManagementController {
         companyServiceImpl.batchDelete(reqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<CompanyVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.myInvite(reqVo));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.controller;
 
 
 import com.pangding.web.authority.vo.RoleVo;
+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;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * @author zhangjinyao
@@ -60,7 +63,7 @@ public class RoleController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult listRoles(@RequestBody ListRoleReqVo req){
+    public ResponseResult<List<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",req.getCompanyId())
                 .checkException();

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

 package com.pangding.web.authority.controller;
 
 
+import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * @author zhangjinyao
@@ -79,5 +82,4 @@ public class UserController {
                 .checkException();
         return ResponseResult.result(userServiceImpl.getUserById(webUserReqVo.getId()));
     }
-
 }

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

 package com.pangding.web.authority.dao;
 
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
@@ -56,4 +57,11 @@ public interface UserDao extends BaseDao {
     PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
 
     UserVo getSuperAdmin(UserGetSuperAdminReqVo reqVo);
+
+    /**
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
+     */
+    PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo);
 }

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

@@ -28,7 +28,8 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("companyName","and company_name = ? ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")
-                .add("status","and status = ?");
+                .add("examineStatus","and examine_status = ?")
+                .add("companyId","and pid = ? ");
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.UserDao;
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
@@ -22,6 +23,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
     private static final String CHECK_PHONE = "CHECK_PHONE";
     private static final String GET_SUPER_ADMIN = "GET_SUPER_ADMIN";
+    private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE";
 
     @Override
     protected void init() {
@@ -37,6 +39,11 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
                 .add("superAdminRoleId","and ur.role_id = ?")
                 .add("companyId","and u.company_id = ? ");
 
+        table.add(COUNT_BY_ROLE,"select u.* from pd_user u,pd_user_role ur where WHERE u.id = ur.user_id")
+                .add("companyId","and u.company_id = ? ")
+                .add("roleId","and ur.role_id = ? ")
+                .add("query","and u.name = ? or u.account = ? or phone = ?");
+
     }
 
     @Override
@@ -68,4 +75,9 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     public UserVo getSuperAdmin(UserGetSuperAdminReqVo reqVo) {
         return this.queryFirst(UserVo.class,GET_SUPER_ADMIN,reqVo);
     }
+
+    @Override
+    public PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo) {
+        return this.queryPage(UserVo.class,reqVo,COUNT_BY_ROLE,reqVo);
+    }
 }

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

+package com.pangding.web.authority.feign;
+
+import com.pangding.web.authority.vo.WxVo;
+import com.pangding.web.authority.vo.reqvo.QrCodeReqVo;
+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/6 16:20
+ */
+@FeignClient(value="pd-interface-wx")
+@RequestMapping(value="/wx")
+public interface WxFeign {
+    /**
+     * 获取二维码
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/qcCodeGet")
+    public ResponseResult<WxVo> qcCodeGet(@RequestBody QrCodeReqVo req);
+}

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

@@ -63,7 +63,7 @@ public interface CompanyService{
      * @param reqVo 封装了公司id和验证码的请求对象
      * @return
      */
-    void companySubmit(CompanySubmitReqVo reqVo);
+    void companySubmit(SaveCompanyReqVo reqVo);
 
     /**
      * 仅将公司状态设置为12（停用）
@@ -142,4 +142,11 @@ public interface CompanyService{
      * @return
      */
     void batchUpdate(BatchUpdateReqVo reqVo) throws Exception;
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo);
 }

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

@@ -60,7 +60,7 @@ public interface RoleService {
      * @param reqVo 封装了公司id和权限id的请求对象
      * @return 用户列表
      */
-    List<UserVo> countByRole(CountByRoleReqVo reqVo);
+    List<UserVo> count(CountByRoleReqVo reqVo);
 
     /**
      * 通过角色id查询该角色权限id列表
@@ -101,4 +101,11 @@ public interface RoleService {
      */
     void delete(WebRoleReqVo webRoleReqVo);
 
+    /**
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
+     */
+    PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo);
+
 }

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

 package com.pangding.web.authority.service.impl;
 
-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.dao.*;
 import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.feign.StoreFeign;
+import com.pangding.web.authority.feign.WxFeign;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.util.CompanyBankCardConstant;
@@ -52,6 +50,10 @@ public class CompanyServiceImpl implements CompanyService{
     PayFeign payFeign;
     @Autowired
     StoreFeign storeFeign;
+    @Autowired
+    WxFeign wxFeign;
+    @Autowired
+    UserRoleDao userRoleDaoImpl;
 
     /**
      * 修改公司信息
@@ -152,80 +154,39 @@ public class CompanyServiceImpl implements CompanyService{
         userServiceImpl.isValid(reqVo.getAccount());
         UserVo userReqVo = new UserVo();
         userReqVo.setAccount(reqVo.getAccount());
+        if (null != reqVo.getUserId() && !reqVo.getUserId().isEmpty()){
+            userReqVo.setId(reqVo.getUserId());
+        }
         userServiceImpl.checkAccount(userReqVo);
         /*公司主表*/
-
         CompanyVo companyVo = new CompanyVo();
-        if (null == reqVo.getCompanyId() || reqVo.getCompanyId().isEmpty()){
-            ObjectHelper.writeWithFrom(companyVo,reqVo);
-            companyVo.setId(StringHelper.getNewID());
-            companyVo.setAddress(reqVo.getCompanyAddress());
-            companyVo.setStatus(0);
-            companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
-        }else{
-            CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
-            companyGetReqVo.setId(reqVo.getCompanyId());
-            CompanyVo companyVo1 = companyDao.load(companyGetReqVo,CompanyVo.class);
-            ObjectHelper.writeWithFrom(companyVo1,companyVo);
-            companyVo.setCompanyType(reqVo.getCompanyType());
-            companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
-            companyVo.setCompanyName(reqVo.getCompanyName());
-            companyVo.setAddress(reqVo.getCompanyAddress());
-            companyVo.setBusinessLicenseCode(reqVo.getBusinessLicenseCode());
-            companyVo.setContactName(reqVo.getContactName());
-            companyVo.setContactCode(reqVo.getContactCode());
-            companyVo.setContactPhone(reqVo.getContactPhone());
-        }
-
-
-        /*调用支付服务注册*/
+        companyVo.setId(StringHelper.getNewID());
+        ObjectHelper.writeWithFrom(companyVo,reqVo);
+        companyVo.setAddress(reqVo.getCompanyAddress());
+        companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyVo.setStatus(0);
+        companyVo.setExamineStatus(0);
+
+        /*注册服务请求对象*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
         ObjectHelper.writeWithFrom(companyReqVo,companyVo);
 
+        /*银行卡*/
         if (reqVo.getCompanyType() == 1){
-            /*银行卡表*/
-            CompanyBankCardVo bankCardVo = new CompanyBankCardVo();
-            /*第一次请求传了银行卡，或者第一次没传，修改后传了*/
-            if (null == reqVo.getCompanyBankCardId() || reqVo.getCompanyBankCardId().isEmpty()){
-                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);
-            }
-            /*第一次传了，修改后*/
-            else{
-                CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
-                getReqVo.setId(reqVo.getCompanyBankCardId());
-                CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
-                ObjectHelper.writeWithFrom(bankCardVo,companyBankCardVo);
-                bankCardVo.setBankName(reqVo.getBankName());
-                bankCardVo.setBankAddress(reqVo.getBankAddress());
-                bankCardVo.setBankCardCode(reqVo.getBankCardCode());
-                bankCardVo.setBankCode(reqVo.getBankCode());
-                bankCardVo.setName(reqVo.getContactName());
-                bankCardVo.setPhone(reqVo.getContactPhone());
-                bankCardVo.setIdCard(reqVo.getContactCode());
-                bankCardVo.setType(reqVo.getCompanyType());
-            }
-
-
+            CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+            ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
+            companyBankCardVo.setName(reqVo.getContactName());
+            companyBankCardVo.setPhone(reqVo.getContactPhone());
+            companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            companyBankCardVo.setType(reqVo.getCompanyType());
+            companyBankCardVo.setIdCard(reqVo.getContactCode());
+            companyBankCardVo.setCompanyId(companyVo.getId());
 
             CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-            ObjectHelper.writeWithFrom(companyBankReqVo,bankCardVo);
+            ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
             companyReqVo.getBankList().add(companyBankReqVo);
         }
-        /*第一次传了，后面修改为个人类型不需要银行卡，则将之前的删除*/
-        else if (reqVo.getCompanyType() == 0 && companyVo.getCompanyType() == 1){
-            CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
-            companyBankCardGetReqVo.setId(reqVo.getCompanyBankCardId());
-            companyBankCardDao.remove(companyBankCardGetReqVo);
-        }
-
         /*注册*/
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
@@ -235,15 +196,12 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
+        companyVo1.setExamineStatus(companyVo.getExamineStatus());
 
         /*保存公司主表*/
-        if (null == reqVo.getCompanyId() || reqVo.getCompanyId().isEmpty()){
-            companyDao.create(companyVo1);
-        }else{
-            companyDao.update(companyVo1);
-        }
-
+        companyDao.create(companyVo1);
         resVo.setCompanyId(companyVo1.getId());
+
         /*保存银行卡表*/
         List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
         if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()){
@@ -251,50 +209,34 @@ public class CompanyServiceImpl implements CompanyService{
             CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
             ObjectHelper.writeWithFrom(companyBankCardVo,companyBankReqVo);
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
-            if (null == reqVo.getCompanyBankCardId() || reqVo.getCompanyBankCardId().isEmpty()){
-                companyBankCardDao.create(companyBankCardVo);
-            }else{
-                companyBankCardDao.update(companyBankCardVo);
-            }
+
+            companyBankCardDao.create(companyBankCardVo);
+
             resVo.setCompanyBankCardId(companyBankCardVo.getId());
         }
 
         /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();
-        extendVo.setId(companyVo.getId());
-        if (null == reqVo.getCompanyExtendId() || reqVo.getCompanyExtendId().isEmpty()){
-            String qrCode = DateHelper.getNow()
-                    .replace("-","")
-                    .replace(":","")
-                    .replace(" ","");
-            extendVo.setQrCode(qrCode);
-            companyExtendDaoImpl.create(extendVo);
-            resVo.setCompanyExtendId(extendVo.getId());
-        }
+        extendVo.setId(companyVo1.getId());
+        String qrCode = DateHelper.getNow()
+                .replace("-","")
+                .replace(":","")
+                .replace(" ","");
+        extendVo.setQrCode(qrCode);
+        companyExtendDaoImpl.create(extendVo);
+        resVo.setCompanyExtendId(extendVo.getId());
 
         /*保存商户表*/
         MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
-        if (null != reqVo.getMerchantId() && !reqVo.getMerchantId().isEmpty()){
-            CompanyScenicInfoReqVo scenicInfoReqVo = new CompanyScenicInfoReqVo();
-            scenicInfoReqVo.setReqId(reqVo.getReqId());
-            scenicInfoReqVo.setCompanyId(reqVo.getCompanyId());
-            scenicInfoReqVo.setProductOrInterface(companyVo.getProductOrInterface());
-            ResponseResult result2 = storeFeign.getCompanyScenicInfo(scenicInfoReqVo);
-            if (null != result2 && "00".equals(result2.getCode())){
-                Merchant merchant = (Merchant) result2.getData();
-                ObjectHelper.writeWithFrom(merchantCreateReqVo,merchant);
-                merchantCreateReqVo.setName(reqVo.getMerchantName());
-                merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
-            }
-        }else{
-            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());
-        }
+
+        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())){
@@ -305,23 +247,22 @@ public class CompanyServiceImpl implements CompanyService{
 
         /*保存用户*/
         UserVo userVo = new UserVo();
-        if (null == reqVo.getUserId() || reqVo.getUserId().isEmpty()){
-            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.create(userVo);
-        }else {
-            UserGetReqVo userGetReqVo = new UserGetReqVo();
-            userGetReqVo.setId(reqVo.getUserId());
-            UserVo userVo1 = userDaoImpl.load(userGetReqVo,UserVo.class);
-            ObjectHelper.writeWithFrom(userVo,userVo1);
-            userVo.setAccount(reqVo.getAccount());
-            userDaoImpl.update(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.create(userVo);
+
+        /*将该用户设置为超级管理员*/
+        UserRoleVo userRoleVo = new UserRoleVo();
+        userRoleVo.setId(StringHelper.getNewID());
+        userRoleVo.setUserId(userVo.getId());
+        userRoleVo.setRoleId(RoleConstant.SUPER_ADMIN_ROLE_ID);
+        userRoleDaoImpl.create(userRoleVo);
+
         resVo.setUserId(userVo.getId());
 
         return resVo;
@@ -334,44 +275,88 @@ public class CompanyServiceImpl implements CompanyService{
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void companySubmit(CompanySubmitReqVo reqVo) {
+    public void companySubmit(SaveCompanyReqVo reqVo) {
+        /*公司主表*/
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(reqVo.getCompanyId());
         CompanyVo companyVo = companyDao.load(companyGetReqVo,CompanyVo.class);
+        companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
+        companyVo.setCompanyName(reqVo.getCompanyName());
+        companyVo.setAddress(reqVo.getCompanyAddress());
+        companyVo.setBusinessLicenseCode(reqVo.getBusinessLicenseCode());
+        companyVo.setContactName(reqVo.getContactName());
+        companyVo.setContactCode(reqVo.getContactCode());
+        companyVo.setContactPhone(reqVo.getContactPhone());
+        /*注册请求对象*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
+        companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
         ObjectHelper.writeWithFrom(companyReqVo,companyVo);
         companyReqVo.setValidateCode(reqVo.getVerifyCode());
-        /*若公司类型为企业，则需要加入银行卡*/
-        if (companyVo.getCompanyType() == 1){
+        companyReqVo.setId(reqVo.getId());
+
+        /*银行卡*/
+        if (null != reqVo.getCompanyBankCardId() && !reqVo.getCompanyBankCardId().isEmpty()){
             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);
+            companyBankCardGetReqVo.setId(reqVo.getCompanyBankCardId());
+            CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
+            CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+            ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
+            companyReqVo.getBankList().add(companyBankReqVo);
         }
-        /*调用支付接口验证验证码*/
+
+        /*注册服务验证验证码*/
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
-            throw new CodeException("保存出错，请重试");
+            throw new CodeException("验证失败，请重试");
         }
-        CompanyReqVo companyReqVo1 = (CompanyReqVo) result.getData();
+
+        /*更新公司主表*/
+        CompanyReqVo res = (CompanyReqVo) result.getData();
         CompanyVo companyVo1 = new CompanyVo();
-        ObjectHelper.writeWithFrom(companyVo1,companyReqVo1);
+        ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
+        companyVo1.setExamineStatus(companyVo.getExamineStatus());
         companyDao.update(companyVo1);
-        /*若公司类型为企业，则需要修改银行卡*/
-        if (companyVo1.getCompanyType() == 1){
-            CompanyBankReqVo companyBankReqVo = companyReqVo1.getBankList().get(0);
+
+        /*更新银行卡表*/
+        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.update(companyBankCardVo);
         }
+
+        /*更新商户表*/
+        MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
+
+        CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
+        ObjectHelper.writeWithFrom(companyScenicInfoReqVo,companyVo);
+        companyScenicInfoReqVo.setCompanyId(companyVo.getId());
+        companyScenicInfoReqVo.setReqId(reqVo.getReqId());
+        ResponseResult result1 = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
+        if (null == result1 || !"00".equals(result1.getCode())){
+            throw new CodeException("验证失败，请重试");
+        }
+        Merchant merchant = (Merchant) result1.getData();
+        ObjectHelper.writeWithFrom(merchantCreateReqVo,merchant);
+        merchantCreateReqVo.setReqId(reqVo.getReqId());
+        merchantCreateReqVo.setType(reqVo.getCompanyAttribute());
+        merchantCreateReqVo.setName(reqVo.getMerchantName());
+        merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
+
+        ResponseResult result2 = storeFeign.merchantCreate(merchantCreateReqVo);
+        if (null == result2 || !"00".equals(result2.getCode())){
+            throw new CodeException("验证失败，请重试");
+        }
+
+        /*更新用户表*/
+        UserGetReqVo userGetReqVo = new UserGetReqVo();
+        userGetReqVo.setId(reqVo.getUserId());
+        UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
+        userVo.setAccount(reqVo.getAccount());
+        userDaoImpl.update(userVo);
     }
 
     /**
@@ -524,6 +509,7 @@ public class CompanyServiceImpl implements CompanyService{
      * @return 二维码url
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
         CompanyExtendGetReqVo reqVo1 = new CompanyExtendGetReqVo();
         reqVo1.setId(reqVo.getCompanyId());
@@ -537,14 +523,42 @@ public class CompanyServiceImpl implements CompanyService{
         }
         String qrCode = companyExtendVo.getQrCode();
         if (null == qrCode || qrCode.isEmpty()){
-            qrCode = DateHelper.getNow()
+            String code = DateHelper.getNow()
                     .replace("-","")
                     .replace(":","")
                     .replace(" ","");
+            companyExtendVo.setQrCode(code);
         }
         int select = reqVo.getSelect();
         /*此处应调用微信接口传入qrCode和select获取qrCodeUrl*/
-        return null;
+        QrCodeReqVo qrCodeReqVo = new QrCodeReqVo();
+        /*临时二维码，超时时间30分钟*/
+        SceneInfo sceneInfo = new SceneInfo();
+        Scene scene = new Scene();
+        scene.setScene_str(companyExtendVo.getQrCode());
+        sceneInfo.setScene(scene);
+        qrCodeReqVo.setAction_info(sceneInfo);
+        if (select == 1){
+            qrCodeReqVo.setExpire_seconds(60*30);
+            qrCodeReqVo.setAction_name("QR_STR_SCENE");
+        }else{
+            qrCodeReqVo.setAction_name("QR_LIMIT_STR_SCENE");
+        }
+        ResponseResult result;
+        try {
+
+            result= wxFeign.qcCodeGet(qrCodeReqVo);
+        }catch (CodeException e){
+            throw new CodeException(e.getCode(),e.getMessage());
+        }
+
+        WxVo wxVo = (WxVo) result.getData();
+        String qrCodeUrl = "http://192.168.0.120:8888/"+wxVo.getPdUrl();
+        if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())){
+            companyExtendVo.setQrCodeUrl(qrCodeUrl);
+            companyExtendDaoImpl.update(companyExtendVo);
+        }
+        return qrCodeUrl;
     }
 
     /**
@@ -642,4 +656,14 @@ public class CompanyServiceImpl implements CompanyService{
             userDaoImpl.update(userVo);
         }
     }
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @Override
+    public PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo) {
+        return companyDao.getCompanyList(reqVo);
+    }
 }

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

@@ -145,7 +145,7 @@ public class RoleServiceImpl implements RoleService {
             CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo();
             countByRoleReqVo.setCompanyId(req.getCompanyId());
             countByRoleReqVo.setRoleId(roleVo.getId());
-            List<UserVo> userVoList = countByRole(countByRoleReqVo);
+            List<UserVo> userVoList = count(countByRoleReqVo);
             if (null == userVoList || userVoList.isEmpty()){
                 resVo.setCount(0);
             }
@@ -163,7 +163,7 @@ public class RoleServiceImpl implements RoleService {
      * @return 用户列表
      */
     @Override
-    public List<UserVo> countByRole(CountByRoleReqVo reqVo) {
+    public List<UserVo> count(CountByRoleReqVo reqVo) {
         UserRoleGetReqVo getReqVo = new UserRoleGetReqVo();
         getReqVo.setRoleId(reqVo.getRoleId());
         List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(getReqVo,UserRoleVo.class);
@@ -268,4 +268,9 @@ public class RoleServiceImpl implements RoleService {
         RoleVo roleVo = this.getRoleById(webRoleReqVo);
         this.deleteRole(roleVo);
     }
+
+    @Override
+    public PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo) {
+        return userDaoImpl.countByRole(reqVo);
+    }
 }

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 17:09
+ */
+public class Scene extends BaseVo {
+    /**
+     * 场景值ID，临时二维码时为32位非0整型，永久二维码时最大值为100000（目前参数只支持1--100000）
+     */
+    private String scene_id;
+    /**
+     * 场景值ID（字符串形式的ID），字符串类型，长度限制为1到64
+     */
+    private String scene_str;
+
+    public String getScene_id() {
+        return scene_id;
+    }
+
+    public void setScene_id(String scene_id) {
+        this.scene_id = scene_id;
+    }
+
+    public String getScene_str() {
+        return scene_str;
+    }
+
+    public void setScene_str(String scene_str) {
+        this.scene_str = scene_str;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 16:31
+ */
+public class SceneInfo extends BaseVo {
+    private Scene scene;
+
+    public Scene getScene() {
+        return scene;
+    }
+
+    public void setScene(Scene scene) {
+        this.scene = scene;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 17:43
+ */
+public class WxVo {
+    private String gcCodeId;
+
+    private String ticket;
+
+    private String expireSeconds;
+
+    private String wxUrl;
+
+    private String pdUrl;
+
+    private String scenicInfo;
+
+    private String codeType;
+
+    public String getGcCodeId() {
+        return gcCodeId;
+    }
+
+    public void setGcCodeId(String gcCodeId) {
+        this.gcCodeId = gcCodeId;
+    }
+
+    public String getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(String ticket) {
+        this.ticket = ticket;
+    }
+
+    public String getExpireSeconds() {
+        return expireSeconds;
+    }
+
+    public void setExpireSeconds(String expireSeconds) {
+        this.expireSeconds = expireSeconds;
+    }
+
+    public String getWxUrl() {
+        return wxUrl;
+    }
+
+    public void setWxUrl(String wxUrl) {
+        this.wxUrl = wxUrl;
+    }
+
+    public String getPdUrl() {
+        return pdUrl;
+    }
+
+    public void setPdUrl(String pdUrl) {
+        this.pdUrl = pdUrl;
+    }
+
+    public String getScenicInfo() {
+        return scenicInfo;
+    }
+
+    public void setScenicInfo(String scenicInfo) {
+        this.scenicInfo = scenicInfo;
+    }
+
+    public String getCodeType() {
+        return codeType;
+    }
+
+    public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+}

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

 package com.pangding.web.authority.vo.reqvo;
 
+import com.yanzuoguang.util.vo.PageSizeData;
+
 /**
  * @Author zhangjinyao
  * @create 2019/6/3 15:50
  */
-public class CountByRoleReqVo {
+public class CountByRoleReqVo extends PageSizeData {
     private String reqId;
 
     private String roleId;
 
     private String companyId;
 
+    private String query;
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
     public String getReqId() {
         return reqId;
     }

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

@@ -15,7 +15,17 @@ public class ListCompanyReqVo extends PageSizeReqVo {
 
     private String companyAttribute;
 
-    private String status;
+    private String examineStatus;
+
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
 
     public String getCompanyName() {
         return companyName;
@@ -41,12 +51,12 @@ public class ListCompanyReqVo extends PageSizeReqVo {
         this.companyAttribute = companyAttribute;
     }
 
-    public String getStatus() {
-        return status;
+    public String getExamineStatus() {
+        return examineStatus;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setExamineStatus(String examineStatus) {
+        this.examineStatus = examineStatus;
     }
 
     public String getReqId() {

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

+package com.pangding.web.authority.vo.reqvo;
+
+import com.pangding.web.authority.vo.SceneInfo;
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 16:23
+ */
+public class QrCodeReqVo extends BaseVo {
+    /**
+     * 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒。
+     */
+    private int expire_seconds;
+    /**
+     * 二维码类型，QR_SCENE为临时的整型参数值，QR_STR_SCENE为临时的字符串参数值，QR_LIMIT_SCENE为永久的整型参数值，QR_LIMIT_STR_SCENE为永久的字符串参数值
+     */
+    private String action_name;
+    /**
+     * 二维码详细信息
+     */
+    private SceneInfo action_info;
+    /**
+     * 二维码下载标识
+     */
+    private String ticket;
+
+    public String getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(String ticket) {
+        this.ticket = ticket;
+    }
+
+    public int getExpire_seconds() {
+        return expire_seconds;
+    }
+
+    public void setExpire_seconds(int expire_seconds) {
+        this.expire_seconds = expire_seconds;
+    }
+
+    public String getAction_name() {
+        return action_name;
+    }
+
+    public void setAction_name(String action_name) {
+        this.action_name = action_name;
+    }
+
+    public SceneInfo getAction_info() {
+        return action_info;
+    }
+
+    public void setAction_info(SceneInfo action_info) {
+        this.action_info = action_info;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 11:07
+ */
+public class QueryUserReqVo {
+    private String query;
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+}

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

@@ -5,8 +5,10 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/6/4 16:52
  */
 public class SaveCompanyReqVo {
+
     private String reqId;
 
+    private String id;
     /**
      * 用户名
      */
@@ -103,6 +105,24 @@ public class SaveCompanyReqVo {
 
     private String userId;
 
+    private String verifyCode;
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getCompanyExtendId() {
         return companyExtendId;
     }