修改注册判断银行卡

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

@@ -8,6 +8,7 @@ import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyCodeVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -164,7 +165,7 @@ public class CompanyManagementController {
      */
     @RequestMapping(value = "/bankCardList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ApiOperation(value = "获取银行卡列表", notes = "返回银行卡列表")
-    public ResponseResult bankCardList(@RequestBody BankCardListReqVo reqVo){
+    public ResponseResult bankCardList(@RequestBody CompanyBankCardReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();
@@ -241,7 +242,7 @@ public class CompanyManagementController {
      * @return
      */
     @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<CompanyResVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+    public ResponseResult<PageSizeData<CompanyResVo>> myInvite(@RequestBody CompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();

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

@@ -2,8 +2,8 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.VerifyCodeService;
-import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.vo.system.req.LoginReqVo;
+import com.pangding.web.vo.system.res.LoginResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import io.swagger.annotations.Api;

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

@@ -41,7 +41,7 @@ public class PangdingManagementController {
      * @return 公司列表分页对象
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<CompanyResVo>> list(@RequestBody ListCompanyReqVo reqVo){
+    public ResponseResult<PageSizeData<CompanyResVo>> list(@RequestBody CompanyReqVo reqVo){
         return ResponseResult.result(companyServiceImpl.list(reqVo));
     }
 
@@ -198,7 +198,7 @@ public class PangdingManagementController {
      * @return 银行卡列表分页对象
      */
     @RequestMapping(value = "/bankCardList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult bankCardList(@RequestBody BankCardListReqVo reqVo){
+    public ResponseResult bankCardList(@RequestBody CompanyBankCardReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();
@@ -290,7 +290,7 @@ public class PangdingManagementController {
      * @return
      */
     @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<CompanyResVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+    public ResponseResult<PageSizeData<CompanyResVo>> myInvite(@RequestBody CompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();

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

@@ -146,6 +146,4 @@ public class UserController {
         return userServiceImpl.registerSaveUser(saveUserReqVo);
     }
 
-
-
 }

src/main/java/com/pangding/web/authority/controller/code/CodeModelController.java

+package com.pangding.web.authority.controller.code;
+
+import com.pangding.web.authority.service.code.CodeModelService;
+import com.pangding.web.vo.system.pd.code.CodeModelVo;
+import com.pangding.web.vo.system.req.code.CodeModelReqVo;
+import com.pangding.web.vo.system.res.code.CodeModelResVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/codeModel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "码模本相关类", description = "码模本新增、修改、删除等操作")
+public class CodeModelController {
+
+    @Autowired
+    private CodeModelService codeModelService;
+
+    @RequestMapping(value = "/queryCodeModelPageList")
+    @ApiOperation(value = "分页查询码模板列表", notes = "根据页码返回码模板列表")
+    public ResponseResult<PageSizeData<CodeModelResVo>> queryCodeModelPageList(@RequestBody CodeModelReqVo req) {
+        return ResponseResult.result(codeModelService.queryCodeModelPageList(req));
+    }
+
+    @RequestMapping(value = "/queryCodeModelList")
+    @ApiModelProperty(value = "查询码模板列表", notes = "返回所有码模板")
+    public ResponseResult<List<CodeModelResVo>> queryCodeModelList(@RequestBody CodeModelReqVo req) {
+        return ResponseResult.result(codeModelService.queryCodeModelList(req));
+    }
+
+    @RequestMapping(value = "/queryCodeModel")
+    @ApiModelProperty(value = "查询码模板详情", notes = "返回码模板详细信息")
+    public ResponseResult<CodeModelResVo> queryCodeModel(@RequestBody CodeModelReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("codeModelId", req.getCodeModelId())
+                .checkException();
+        return ResponseResult.result(codeModelService.queryCodeModel(req));
+    }
+
+    @RequestMapping(value = "/saveCodeModel")
+    @ApiModelProperty(value = "保存或者修改码模板", notes = "返回码模板保存信息")
+    public ResponseResult<CodeModelVo> saveCodeModel(@RequestBody CodeModelReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("codeType", req.getCodeType())
+                .notBlankCheck("codeModelName", req.getCodeModelName())
+                .notBlankCheck("codeModelLink", req.getCodeModelLink())
+                .notBlankCheck("codeModelImgUrl", req.getCodeModelImgUrl())
+                .checkException();
+        return ResponseResult.result(codeModelService.saveCodeModel(req));
+    }
+
+
+}

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

-package com.pangding.web.authority.controller;
+package com.pangding.web.authority.controller.company;
 
 
 import com.pangding.web.authority.service.CompanyAgreementService;
-import com.pangding.web.authority.service.CompanyMoneyService;
 import com.pangding.web.authority.service.CompanyService;
+import com.pangding.web.authority.service.company.NewCompanyService;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyAgreementReqVo;
-import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
-import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
+import com.pangding.web.vo.system.res.company.CompanyPageResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -24,11 +23,45 @@ import java.util.List;
 @RequestMapping(value = "/newCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public class CompanyController {
 
+    @Autowired
+    private NewCompanyService newCompanyService;
     @Autowired
     private CompanyService companyService;
     @Autowired
     private CompanyAgreementService companyAgreementService;
 
+    @RequestMapping(value = "/findCompanyListPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "分页查询公司列表", notes = "返回公司列表，按页数")
+    public ResponseResult<CompanyPageResVo> findCompanyListPage(@RequestBody CompanyReqVo req) {
+        return ResponseResult.result(newCompanyService.findCompanyListPage(req));
+    }
+
+    @RequestMapping(value = "/findCompanyList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询公司列表", notes = "返回所有的公司列表")
+    public ResponseResult<List<CompanyResVo>> findCompanyList(@RequestBody CompanyReqVo req) {
+        return ResponseResult.result(newCompanyService.findCompanyList(req));
+    }
+
+    @RequestMapping(value = "/findCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询公司信息", notes = "返回公司详细信息")
+    public ResponseResult<CompanyResVo> findCompany(@RequestBody CompanyReqVo req) {
+        return ResponseResult.result(newCompanyService.findCompany(req));
+    }
+
+    @RequestMapping(value = "/updateCompanyInfo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "公司，个人实名制", notes = "返回实名制结果")
+    public ResponseResult<SaveCompanyReqVo> updateCompanyInfo(@RequestBody SaveCompanyReqVo req) {
+        CheckerHelper.newInstance().notBlankCheck("id", req.getCompanyVo().getId()).checkException();
+        return companyService.updateCompanyInfo(req);
+    }
+
+    @RequestMapping(value = "/examineCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "审核配置公司信息", notes = "返回审核配置的结果")
+    public ResponseResult<SaveCompanyReqVo> examineCompany(@RequestBody SaveCompanyReqVo req) {
+        CheckerHelper.newInstance().notBlankCheck("id", req.getCompanyVo().getId()).checkException();
+        return companyService.updateCompanyInfo(req);
+    }
+
 
     /**
      * 找到公司余额
@@ -42,13 +75,6 @@ public class CompanyController {
         return ResponseResult.result(companyService.findCompanyBalance(req));
     }
 
-    @RequestMapping(value = "/updateCompanyInfo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    @ApiOperation(value = "公司，个人实名制", notes = "返回实名制结果")
-    public ResponseResult<SaveCompanyReqVo> updateCompanyInfo(@RequestBody SaveCompanyReqVo req) {
-        CheckerHelper.newInstance().notBlankCheck("id", req.getCompanyVo().getId()).checkException();
-        return companyService.updateCompanyInfo(req);
-    }
-
     @RequestMapping(value = "/checkAgreement")
     @ApiOperation(value = "查询公司是否已签署某合同", notes = "返回合同信息")
     public ResponseResult checkAgreement(@RequestBody CompanyAgreementReqVo req) {

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

@@ -5,6 +5,8 @@ import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
+import com.pangding.web.vo.system.res.authority.UserResVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
@@ -23,20 +25,11 @@ public interface UserDao extends BaseDao {
     void checkAccount(UserVo account);
 
     /**
-     * 通过用户id查询UserVo对象
-     *
-     * @param reqVo 用户id
-     * @return UserVo对象
-     */
-    UserVo getUser(UserGetReqVo reqVo);
-
-    /**
-     * 根据公司id获取UserVo对象
-     *
-     * @param companyId GetUserByCompanyIdReqVo请求对象，封装公司id
-     * @return UserVo对象
+     * 查询用户是否存在
+     * @param req
+     * @return
      */
-    UserVo getUserByCompanyId(UserGetReqVo companyId);
+    UserResVo queryUser(UserReqVo req);
 
     /**
      * 获取用户分页对象

src/main/java/com/pangding/web/authority/dao/code/CodeModelDao.java

+package com.pangding.web.authority.dao.code;
+
+import com.pangding.web.vo.system.req.code.CodeModelReqVo;
+import com.pangding.web.vo.system.res.code.CodeModelResVo;
+import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+import java.util.List;
+
+public interface CodeModelDao extends BaseDao {
+
+    /**
+     * 查询码模板列表（分页）
+     * @param req
+     * @return
+     */
+    PageSizeData<CodeModelResVo> queryCodeModelPageList(CodeModelReqVo req);
+
+
+    /**
+     * 查询码模板列表（不分页）
+     * @param req
+     * @return
+     */
+    List<CodeModelResVo> queryCodeModelList(CodeModelReqVo req);
+
+}

src/main/java/com/pangding/web/authority/dao/code/CodeModelExtendDao.java

+package com.pangding.web.authority.dao.code;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CodeModelExtendDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/code/Impl/CodeModelDaoImpl.java

+package com.pangding.web.authority.dao.code.Impl;
+
+import com.pangding.web.authority.dao.code.CodeModelDao;
+import com.pangding.web.vo.system.pd.code.CodeModelVo;
+import com.pangding.web.vo.system.req.code.CodeModelReqVo;
+import com.pangding.web.vo.system.res.code.CodeModelResVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CodeModelDaoImpl extends BaseDaoImpl implements CodeModelDao {
+
+    // 查询列表
+    private static final String QUERY_LIST = "QUERY_LIST";
+
+
+    @Override
+    protected void init() {
+        register(CodeModelVo.class);
+
+        table.add(QUERY_LIST, "SELECT * FROM pd_code_model WHERE 1=1 ");
+
+    }
+
+    @Override
+    public PageSizeData<CodeModelResVo> queryCodeModelPageList(CodeModelReqVo req) {
+        return this.queryPage(CodeModelResVo.class, req, QUERY_LIST, req);
+    }
+
+
+    @Override
+    public List<CodeModelResVo> queryCodeModelList(CodeModelReqVo req) {
+        return this.query(CodeModelResVo.class, QUERY_LIST, req);
+    }
+
+}

src/main/java/com/pangding/web/authority/dao/code/Impl/CodeModelExtendDaoImpl.java

+package com.pangding.web.authority.dao.code.Impl;
+
+import com.pangding.web.authority.dao.code.CodeModelExtendDao;
+import com.pangding.web.vo.system.pd.code.CodeModelExtendVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CodeModelExtendDaoImpl extends BaseDaoImpl implements CodeModelExtendDao {
+
+    @Override
+    protected void init() {
+        register(CodeModelExtendVo.class);
+    }
+
+}

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

-package com.pangding.web.authority.dao;
+package com.pangding.web.authority.dao.company;
 
-import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
 import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
-import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.res.company.CompanyBankCardResVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/16 19:17
@@ -16,11 +18,18 @@ public interface CompanyBankCardDao extends BaseDao {
      * @param reqVo
      * @return
      */
-    PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo);
+    PageSizeData<CompanyBankCardResVo> getBankCardListPage(CompanyBankCardReqVo reqVo);
+
+    /**
+     * 获取银行卡列表
+     * @param req
+     * @return
+     */
+    List<CompanyBankCardResVo> getBankCardList(CompanyBankCardReqVo req);
 
     /**
      * 将指定银行卡设置为非默认
-     * @param setNotDefaultReqVo 设置非默认的请求对象
+     * @param req 设置非默认的请求对象
      */
-    void setNotDefault(CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo);
+    void updateDefault(CompanyBankCardReqVo req);
 }

src/main/java/com/pangding/web/authority/dao/CompanyDao.java → src/main/java/com/pangding/web/authority/dao/company/CompanyDao.java

-package com.pangding.web.authority.dao;
+package com.pangding.web.authority.dao.company;
 
-import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
-import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyNumberResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -20,8 +19,13 @@ public interface CompanyDao extends BaseDao {
      * @param reqVo
      * @return
      */
-    PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo);
+    PageSizeData<CompanyResVo> findCompanyListPage(CompanyReqVo reqVo);
 
+    /**
+     * 获取公司列表
+     * @param req
+     * @return
+     */
     List<CompanyResVo> findCompanyList(CompanyReqVo req);
 
     /**
@@ -36,5 +40,5 @@ public interface CompanyDao extends BaseDao {
      * @param req
      * @return
      */
-    CompanyResVo findCompanyTotal(CompanyReqVo req);
+    CompanyNumberResVo findCompanyTotal(CompanyReqVo req);
 }

src/main/java/com/pangding/web/authority/dao/company/CompanyExamineDao.java

+package com.pangding.web.authority.dao.company;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CompanyExamineDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/CompanyExtendDao.java → src/main/java/com/pangding/web/authority/dao/company/CompanyExtendDao.java

-package com.pangding.web.authority.dao;
+package com.pangding.web.authority.dao.company;
 
 import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
 import com.yanzuoguang.dao.BaseDao;
@@ -11,6 +11,10 @@ public interface CompanyExtendDao extends BaseDao {
 
     void updateCompanyMoney(UpdateCompanyMoneyReqVo req);
 
+    /**
+     * 修改已邀请人数
+     * @param req
+     */
     void updateCompanyInvitedPeople(UpdateCompanyMoneyReqVo req);
 
 }

src/main/java/com/pangding/web/authority/dao/company/CompanyMerchantDao.java

+package com.pangding.web.authority.dao.company;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CompanyMerchantDao extends BaseDao {
+
+
+}

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

-package com.pangding.web.authority.dao.impl;
+package com.pangding.web.authority.dao.company.impl;
 
-import com.pangding.web.authority.dao.CompanyBankCardDao;
-import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
 import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.res.company.CompanyBankCardResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/16 19:17
  */
 @Component
 public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCardDao {
-    private static final String GET_BANK_CARD_LIST = "GET_BANK_CARD_LIST";
-    private static final String SET_NOT_DEFAULT = "SET_NOT_DEFAULT";
+
+    private static final String QUERY_BANK_CARD_LIST = "QUERY_BANK_CARD_LIST";
+    private static final String UPDATE_DEFAULT = "UPDATE_DEFAULT";
 
     @Override
     protected void init() {
         register(CompanyBankCardVo.class);
 
-        table.add(GET_BANK_CARD_LIST,"select * from pd_company_bank_card where 1=1 ")
+        table.add(QUERY_BANK_CARD_LIST,"select * from pd_company_bank_card where 1=1 ")
                 .add("companyId","and company_id = ?");
 
-        table.add(SET_NOT_DEFAULT,"update pd_company_bank_card a set a.is_default = 0 where 1=1 ")
+        table.add(UPDATE_DEFAULT,"update pd_company_bank_card a set a.is_default = @isDefault where 1=1 ")
                 .add("id","and id = ?")
                 .add("companyId","and company_id = ?");
     }
 
-    /**
-     * 获取银行卡列表分页数据
-     * @param reqVo
-     * @return
-     */
     @Override
-    public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
-        return this.queryPage(CompanyBankCardVo.class,reqVo,GET_BANK_CARD_LIST,reqVo);
+    public PageSizeData<CompanyBankCardResVo> getBankCardListPage(CompanyBankCardReqVo req) {
+        return this.queryPage(CompanyBankCardResVo.class, req, QUERY_BANK_CARD_LIST, req);
+    }
+
+    @Override
+    public List<CompanyBankCardResVo> getBankCardList(CompanyBankCardReqVo req) {
+        return this.query(CompanyBankCardResVo.class, QUERY_BANK_CARD_LIST, req);
     }
 
     @Override
-    public void setNotDefault(CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo) {
-        this.updateSql(SET_NOT_DEFAULT,setNotDefaultReqVo);
+    public void updateDefault(CompanyBankCardReqVo req) {
+        this.updateSql(UPDATE_DEFAULT,req);
     }
 }

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

-package com.pangding.web.authority.dao.impl;
+package com.pangding.web.authority.dao.company.impl;
 
-import com.pangding.web.authority.dao.CompanyDao;
-import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
+import com.pangding.web.authority.dao.company.CompanyDao;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyNumberResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.dao.DaoConst;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
@@ -23,13 +23,13 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
 
     private static final String QUERY_COMPANY_TOTAL= "QUERY_COMPANY_TOTAL";
 
-
-
     @Override
     protected void init() {
 
         register(CompanyVo.class);
 
+        getSql(DaoConst.LOAD).addCode("{FIELD}", ",b.*", "{INNER}", "INNER JOIN pd_company_extend b ON a.id = b.id");
+
         table.add(QUERY_COMPANY,"select a.*,b.subledger_status,b.subledger_rule,b.subledger_rule_time,b.divide_status,b.scan_code_pay_status," +
                 "invitation_status,invitation_rule_id,invitation_code,invitees_people,invited_people,activation_status,withdraw_rule,min_withdraw_money," +
                 "max_withdraw_money,withdraw_fee,withdraw_type,grade,withdraw_total_cash,frozen_money,discount_rule," +
@@ -41,7 +41,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("companyAttribute","and company_attribute = ? ")
                 .add("examineStatus","and examine_status = ?")
                 .add("companyId","and invitation_company_id = ? ")
-                .add("invitationCode","and invitation_code = ? ")
+                .add("invitationCode","and (invitation_code = or chlid_invitation_code) ")
                 .add("contactName","and contact_name LIKE concat('%', ?,'%') ")
                 .add("contactPhone","and contact_phone = ? ")
                 .add("status","and status = ? ")
@@ -50,7 +50,8 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("startDate","and create_time >= ? ")
                 .add("endDate","and create_time <= ? ");
 
-        table.add(QUERY_COMPANY_TOTAL,"select count(a.id) as company_num " +
+        table.add(QUERY_COMPANY_TOTAL,"select COUNT(a.id) AS company_num," +
+                "SUM(CASE WHEN examine_status = 2 THEN 1 ELSE 0 END) AS company_use_num " +
                 " from pd_company a inner join pd_company_extend b on a.id = b.id " +
                 "where 1=1 {WHERE} order by create_time desc")
                 .add("companyName","and company_name LIKE concat('%', ?,'%')  ")
@@ -65,14 +66,10 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("startDate","and create_time >= ? ")
                 .add("endDate","and create_time <= ? ");
 
-        getSql(DaoConst.LOAD).addCode("{FIELD}", ",b.*", "{INNER}", "INNER JOIN pd_company_extend b ON a.id = b.id");
-
-
-
     }
 
     @Override
-    public PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo) {
+    public PageSizeData<CompanyResVo> findCompanyListPage(CompanyReqVo reqVo) {
         return this.queryPage(CompanyResVo.class,reqVo,QUERY_COMPANY,reqVo);
     }
 
@@ -87,7 +84,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
     }
 
     @Override
-    public CompanyResVo findCompanyTotal(CompanyReqVo req) {
-        return this.queryFirst(CompanyResVo.class, QUERY_COMPANY, req);
+    public CompanyNumberResVo findCompanyTotal(CompanyReqVo req) {
+        return this.queryFirst(CompanyNumberResVo.class, QUERY_COMPANY_TOTAL, req);
     }
 }

src/main/java/com/pangding/web/authority/dao/company/impl/CompanyExamineDaoImpl.java

+package com.pangding.web.authority.dao.company.impl;
+
+import com.pangding.web.authority.dao.company.CompanyExamineDao;
+import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyExamineDaoImpl extends BaseDaoImpl implements CompanyExamineDao {
+
+    @Override
+    protected void init() {
+        register(CompanyExtendVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/CompanyExtendDaoImpl.java → src/main/java/com/pangding/web/authority/dao/company/impl/CompanyExtendDaoImpl.java

-package com.pangding.web.authority.dao.impl;
+package com.pangding.web.authority.dao.company.impl;
 
-import com.pangding.web.authority.dao.CompanyExtendDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;

src/main/java/com/pangding/web/authority/dao/company/impl/CompanyMerchantDaoImpl.java

+package com.pangding.web.authority.dao.company.impl;
+
+import com.pangding.web.authority.dao.company.CompanyMerchantDao;
+import com.pangding.web.vo.system.pd.company.CompanyMerchantVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyMerchantDaoImpl extends BaseDaoImpl implements CompanyMerchantDao {
+
+    @Override
+    protected void init() {
+        register(CompanyMerchantVo.class);
+    }
+
+}

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

@@ -3,9 +3,10 @@ package com.pangding.web.authority.dao.impl;
 import com.pangding.web.authority.dao.UserDao;
 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;
 import com.pangding.web.vo.system.pd.authority.UserVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
+import com.pangding.web.vo.system.res.authority.UserResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
@@ -16,8 +17,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class UserDaoImpl extends BaseDaoImpl implements UserDao {
 
-
-    private static final String SELECT = "SELECT";
+    private static final String QUERY_USER = "QUERY_USER";
     private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
     private static final String GET_ADMIN = "GET_ADMIN";
     private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE";
@@ -26,8 +26,11 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     protected void init() {
         register(UserVo.class);
 
-        table.add(SELECT,"select * from pd_user where 1=1")
-                .add("companyId","and company_id = ? ");
+        table.add(QUERY_USER,"select * from pd_user where 1=1")
+                .add("companyId","and company_id = ? ")
+                .add("account","and account = ? ")
+                .add("phone","and phone = ? ")
+                .add("loginAccount","and (account = ? or phone = ?) ");
 
         table.addExist(CHECK_ACCOUNT,"account");
 
@@ -48,18 +51,13 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     }
 
     @Override
-    public UserVo getUser(UserGetReqVo reqVo) {
-        return this.load(reqVo,UserVo.class);
-    }
-
-    @Override
-    public UserVo getUserByCompanyId(UserGetReqVo companyId) {
-        return this.load(companyId,UserVo.class);
+    public UserResVo queryUser(UserReqVo req) {
+        return this.queryFirst(UserResVo.class, QUERY_USER, req);
     }
 
     @Override
     public PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo) {
-        return this.queryPage(UserVo.class,reqVo,SELECT,reqVo);
+        return this.queryPage(UserVo.class,reqVo,QUERY_USER,reqVo);
     }
 
     @Override

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

 package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityResVo;
 import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.pangding.web.vo.system.pd.authority.AuthorityVo;
+import com.pangding.web.vo.system.res.authority.AuthorityListByLevelResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;

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

@@ -8,6 +8,8 @@ import com.pangding.web.vo.system.pd.company.CompanyCodeVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
+import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyBankCardResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -25,7 +27,7 @@ public interface CompanyService{
      * @param reqVo 继承了分页对象
      * @return 公司列表分页对象
      */
-    PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo);
+    PageSizeData<CompanyResVo> list(CompanyReqVo reqVo);
 
     /**
      * 查询公司详情 （审核）
@@ -39,7 +41,7 @@ public interface CompanyService{
      * @param req
      * @return
      */
-    ResponseResult<com.pangding.web.vo.system.req.company.SaveCompanyReqVo> updateCompanyInfo(com.pangding.web.vo.system.req.company.SaveCompanyReqVo req);
+    ResponseResult<SaveCompanyReqVo> updateCompanyInfo(SaveCompanyReqVo req);
 
     /**
      * 修改公司信息
@@ -139,7 +141,7 @@ public interface CompanyService{
      * @param reqVo 继承了分页对象，含公司id
      * @return 银行卡列表分页对象
      */
-    PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo);
+    PageSizeData<CompanyBankCardResVo> getBankCardList(CompanyBankCardReqVo reqVo);
 
     /**
      * 添加用户
@@ -167,7 +169,7 @@ public interface CompanyService{
      * @param reqVo 封装了公司id的请求对象
      * @return
      */
-    PageSizeData<CompanyResVo> myInvite(ListCompanyReqVo reqVo);
+    PageSizeData<CompanyResVo> myInvite(CompanyReqVo reqVo);
 
     String invitation(InvitationReqVo reqVo);
 

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

 package com.pangding.web.authority.service;
 
 
-import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.LoginReqVo;
+import com.pangding.web.vo.system.res.LoginResVo;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -6,8 +6,11 @@ import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
 import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
+import com.pangding.web.vo.system.req.LoginReqVo;
 import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
 import com.pangding.web.vo.system.req.authority.UserReqVo;
+import com.pangding.web.vo.system.res.LoginResVo;
+import com.pangding.web.vo.system.res.authority.UserResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 
@@ -18,6 +21,27 @@ import java.util.List;
  */
 public interface UserService {
 
+    /**
+     * 登录
+     * @param reqVo
+     * @return
+     */
+    LoginResVo login(LoginReqVo reqVo);
+
+    /**
+     * 用户注册（新tangfang）
+     * @param saveUserReqVo
+     * @return
+     */
+    ResponseResult<String> registerSaveUser(SaveUserReqVo saveUserReqVo);
+
+    /**
+     * 查询用户详情
+     * @param req
+     * @return
+     */
+    UserResVo queryUser(UserReqVo req);
+
     /**
      * 保存用户信息，并保存用户和角色的对应关系
      *
@@ -153,10 +177,5 @@ public interface UserService {
     void checkEmail(String email);
 
 
-    /**
-     * 用户注册（新tangfang）
-     * @param saveUserReqVo
-     * @return
-     */
-    ResponseResult<String> registerSaveUser(SaveUserReqVo saveUserReqVo);
+
 }

src/main/java/com/pangding/web/authority/service/code/CodeModelService.java

+package com.pangding.web.authority.service.code;
+
+import com.pangding.web.vo.system.pd.code.CodeModelVo;
+import com.pangding.web.vo.system.req.code.CodeModelReqVo;
+import com.pangding.web.vo.system.res.code.CodeModelResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+import java.util.List;
+
+public interface CodeModelService {
+
+    /**
+     * 查询码模板列表（分页）
+     * @param req
+     * @return
+     */
+    PageSizeData<CodeModelResVo> queryCodeModelPageList(CodeModelReqVo req);
+
+
+    /**
+     * 查询码模板列表（不分页）
+     * @param req
+     * @return
+     */
+    List<CodeModelResVo> queryCodeModelList(CodeModelReqVo req);
+
+    /**
+     * 查询码模板详情
+     * @param req
+     * @return
+     */
+    CodeModelResVo queryCodeModel(CodeModelReqVo req);
+
+    /**
+     * 保存码模板信息
+     * @param req
+     * @return
+     */
+    CodeModelVo saveCodeModel(CodeModelReqVo req);
+
+}

src/main/java/com/pangding/web/authority/service/code/impl/CodeModelServiceImpl.java

+package com.pangding.web.authority.service.code.impl;
+
+import com.pangding.web.authority.dao.code.CodeModelDao;
+import com.pangding.web.authority.dao.code.CodeModelExtendDao;
+import com.pangding.web.authority.service.code.CodeModelService;
+import com.pangding.web.vo.system.pd.code.CodeModelExtendVo;
+import com.pangding.web.vo.system.pd.code.CodeModelVo;
+import com.pangding.web.vo.system.req.code.CodeModelReqVo;
+import com.pangding.web.vo.system.res.code.CodeModelResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CodeModelServiceImpl implements CodeModelService {
+
+    @Autowired
+    private CodeModelDao codeModelDao;
+    @Autowired
+    private CodeModelExtendDao codeModelExtendDao;
+
+    @Override
+    public PageSizeData<CodeModelResVo> queryCodeModelPageList(CodeModelReqVo req) {
+        return codeModelDao.queryCodeModelPageList(req);
+    }
+
+    @Override
+    public List<CodeModelResVo> queryCodeModelList(CodeModelReqVo req) {
+        return codeModelDao.queryCodeModelList(req);
+    }
+
+    @Override
+    public CodeModelResVo queryCodeModel(CodeModelReqVo req){
+        CodeModelResVo codeModelResVo = codeModelDao.load(req, CodeModelResVo.class);
+        // TODO 查询码模板扩展信息
+        return codeModelResVo;
+    }
+
+    public CodeModelVo saveCodeModel(CodeModelReqVo req){
+        CodeModelVo codeModelVo = new CodeModelVo();
+        String codeModelId = req.getCodeModelId();
+        if(StringHelper.isEmpty(codeModelId)){
+            // 主键不存在，新增  根据码类型和码模板名称去重
+            CodeModelReqVo codeModelReqVo = new CodeModelReqVo();
+            codeModelReqVo.setCodeType(req.getCodeType());
+            codeModelReqVo.setCodeModelName(req.getCodeModelName());
+            CodeModelResVo codeModelResVo = codeModelDao.load(codeModelReqVo, CodeModelResVo.class);
+            if(StringHelper.isEmpty(codeModelResVo)){
+                // 没有该模板 新增
+                codeModelId = StringHelper.getNewID();
+                ObjectHelper.writeWithFromClass(codeModelVo, req);
+                codeModelVo.setCodeModelId( codeModelId);
+                codeModelDao.create(codeModelVo);
+                List<CodeModelExtendVo> codeModelExtendVoList = req.getCodeModelExtendList();
+                for (CodeModelExtendVo codeModelExtendVo: codeModelExtendVoList) {
+                    codeModelExtendVo.setCodeModelId(codeModelId);
+                    codeModelExtendVo.setCodeModelExtendId(StringHelper.getNewID());
+                }
+                codeModelExtendDao.createArray(codeModelExtendVoList);
+            }else{
+                ObjectHelper.writeWithFromClass(codeModelVo, req);
+                codeModelVo.setCodeModelId(codeModelResVo.getCodeModelId());
+                codeModelDao.update(codeModelVo);
+                List<CodeModelExtendVo> codeModelExtendVoList = req.getCodeModelExtendList();
+                codeModelExtendDao.updateArray(codeModelExtendVoList);
+            }
+        }else{
+            // 主键存在，修改
+            ObjectHelper.writeWithFromClass(codeModelVo, req);
+            codeModelDao.update(codeModelVo);
+            List<CodeModelExtendVo> codeModelExtendVoList = req.getCodeModelExtendList();
+            codeModelExtendDao.updateArray(codeModelExtendVoList);
+        }
+        return codeModelVo;
+    }
+
+}

src/main/java/com/pangding/web/authority/service/company/CompanyBankCardService.java

+package com.pangding.web.authority.service.company;
+
+import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.res.company.CompanyBankCardResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+
+import java.util.List;
+
+public interface CompanyBankCardService {
+
+    /**
+     * 分页查询银行卡列表
+     * @param req
+     * @return
+     */
+    PageSizeData<CompanyBankCardResVo> findCompanyBankCardListPage(CompanyBankCardReqVo req);
+
+    /**
+     * 查询银行卡列表
+     * @param req
+     * @return
+     */
+    List<CompanyBankCardResVo> findCompanyBankCardList(CompanyBankCardReqVo req);
+
+    /**
+     * 保存银行卡
+     * @param reqVo
+     * @return
+     */
+    ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo);
+
+    /**
+     * 删除银行卡（通联解绑银行卡）
+     * @param req
+     */
+    void deleteBank(CompanyBankCardReqVo req);
+
+    /**
+     * 设计默认银行卡
+     * @param req
+     */
+    void setDefaultBankCard(CompanyBankCardReqVo req);
+
+}

src/main/java/com/pangding/web/authority/service/company/CompanyRuleService.java

+package com.pangding.web.authority.service.company;
+
+import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
+
+import java.util.List;
+
+public interface CompanyRuleService {
+
+    void saveCompanyRule(List<CompanyRuleVo> companyRuleVoList, String companyId);
+
+}

src/main/java/com/pangding/web/authority/service/company/NewCompanyService.java

+package com.pangding.web.authority.service.company;
+
+import com.pangding.web.vo.system.req.company.CompanyReqVo;
+import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyPageResVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
+import com.yanzuoguang.util.vo.ResponseResult;
+
+import java.util.List;
+
+public interface NewCompanyService {
+
+    /**
+     * 查询公司列表（分页）
+     * @param req
+     * @return
+     */
+    CompanyPageResVo findCompanyListPage(CompanyReqVo req);
+
+    /**
+     * 查询公司列表
+     * @param req
+     * @return
+     */
+    List<CompanyResVo> findCompanyList(CompanyReqVo req);
+
+    /**
+     * 找到公司详情信息
+     * @param req
+     * @return
+     */
+    CompanyResVo findCompany(CompanyReqVo req);
+
+    /**
+     * 修改公司信息 （实名认证）
+     * @param req
+     * @return
+     */
+    ResponseResult<SaveCompanyReqVo> updateCompanyInfo(SaveCompanyReqVo req);
+
+
+    /**
+     * 检查邀请码是否正确和邀请是否符合邀请规则
+     *
+     * @param invitationCode
+     */
+    CompanyResVo checkInvitationCode(String invitationCode);
+
+}

src/main/java/com/pangding/web/authority/service/company/impl/CompanyBankCardServiceImpl.java

+package com.pangding.web.authority.service.company.impl;
+
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.feign.PayFeign;
+import com.pangding.web.authority.service.company.CompanyBankCardService;
+import com.pangding.web.authority.util.CompanyBankCardConstant;
+import com.pangding.web.authority.vo.reqvo.CompanyBankCardGetReqVo;
+import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
+import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.res.company.CompanyBankCardResVo;
+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.Date;
+import java.util.List;
+
+@Service
+public class CompanyBankCardServiceImpl implements CompanyBankCardService {
+
+    @Autowired
+    private CompanyDao companyDao;
+    @Autowired
+    private CompanyBankCardDao companyBankCardDao;
+    @Autowired
+    private PayFeign payFeign;
+
+    @Override
+    public PageSizeData<CompanyBankCardResVo> findCompanyBankCardListPage(CompanyBankCardReqVo req){
+        return companyBankCardDao.getBankCardListPage(req);
+    }
+
+    @Override
+    public List<CompanyBankCardResVo> findCompanyBankCardList(CompanyBankCardReqVo req){
+        return companyBankCardDao.getBankCardList(req);
+    }
+
+    /**
+     * 保存/更新银行卡信息，并调用第三方接口发送手机验证码
+     *
+     * @param reqVo 公司银行卡表信息
+     * @return 银行卡表主键
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo) {
+        // 公司是否存在
+        CompanyVo companyVo = companyDao.load(reqVo.getCompanyId(), CompanyVo.class);
+        if (StringHelper.isEmpty(companyVo)) {
+            throw new CodeException("用户信息没有找到。");
+        }
+        // 判断银行卡是否存在
+        Date date = DateHelper.getDateTime(companyVo.getCreateTime());
+        String bankId = StringHelper.getNewIdMD5(date, companyVo.getId(), reqVo.getBankCardCode());
+        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(bankId, CompanyBankCardVo.class);
+        // 银行卡不为空，并且状态为已绑定成功
+        if (!StringHelper.isEmpty(companyBankCardVo)) {
+            if (com.pangding.web.constant.CompanyConstant.BANK_STATUS_SUCCESS == companyBankCardVo.getStatus()) {
+                throw new CodeException("银行卡已绑定，不可修改。");
+            }
+            //修改数据库
+            reqVo.setReservedPhone(reqVo.getPhone());
+            ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
+            companyBankCardDao.update(companyBankCardVo);
+        } else {
+            companyBankCardVo = new CompanyBankCardVo();
+            reqVo.setId(bankId);
+            reqVo.setStatus(0);
+            reqVo.setType(0);
+            reqVo.setReservedPhone(reqVo.getPhone());
+            // 查询该公司是否已经有默认银行卡了
+            CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
+            companyBankCardReqVo.setCompanyId(reqVo.getCompanyId());
+            companyBankCardReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            CompanyBankCardResVo companyBankCardResVo = companyBankCardDao.load(companyBankCardReqVo, CompanyBankCardResVo.class);
+            //若该银行卡是第一张银行卡，则设为默认
+            if (StringHelper.isEmpty(companyBankCardResVo)) {
+                reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            } else {
+                reqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
+            }
+            ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
+            companyBankCardDao.create(companyBankCardVo);
+        }
+        ResponseResult<CompanyBankCardReqVo> result = payFeign.bindBack(reqVo);
+        if (StringHelper.isEmpty(result) || !"00".equals(result.getCode())) {
+            throw new CodeException("绑定银行卡失败，请重试");
+        }
+        CompanyBankCardReqVo resVo = result.getData();
+        ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
+        companyBankCardDao.update(companyBankCardVo);
+        return ResponseResult.result(companyBankCardVo);
+    }
+
+//    /**
+//     * 提交银行卡信息，验证手机验证码，并更新银行卡状态
+//     *
+//     * @param reqVo 银行卡表数据+验证码
+//     * @return 目前返回验证码
+//     */
+//    @Override
+//    @Transactional(rollbackFor = Exception.class)
+//    public CompanyBankCardVo bankSubmit(BankSubmitReqVo reqVo) {
+//        /*根据银行卡id获取银行卡信息*/
+//        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+//        getReqVo.setId(reqVo.getId());
+//        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
+//
+//        /*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
+//        CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
+//        ObjectHelper.writeWithFrom(companyBankCardReqVo, companyBankCardVo);
+//        companyBankCardReqVo.setPhone(companyBankCardVo.getReservedPhone());
+//        companyBankCardReqVo.setValidateCode(reqVo.getVerifyCode());
+//        ResponseResult<CompanyBankCardReqVo> result = payFeign.bindBack(companyBankCardReqVo);
+//        if (null == result || !"00".equals(result.getCode())) {
+//            throw new CodeException("绑定银行卡失败，请重试");
+//        }
+//        CompanyBankCardReqVo resVo = result.getData();
+//        ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
+//        companyBankCardDao.update(companyBankCardVo);
+//
+//        return companyBankCardVo;
+//    }
+
+    /**
+     * 调用支付服务解绑银行卡，并更新银行卡状态
+     *
+     * @param req 封装了银行卡id的请求对象
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteBank(CompanyBankCardReqVo req) {
+        // 查询银行卡信息
+        CompanyBankCardVo bankCardVo = companyBankCardDao.load(req.getId(), CompanyBankCardVo.class);
+        if(StringHelper.isEmpty(bankCardVo)){
+            throw new CodeException("银行卡未找到。");
+        }
+        // 解绑通联绑定的银行卡
+        CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
+        ObjectHelper.writeWithFrom(companyBankCardReqVo, bankCardVo);
+        ResponseResult result = payFeign.unbindBankCard(companyBankCardReqVo);
+        if (StringHelper.isEmpty(result) || !"00".equals(result.getCode())) {
+            throw new CodeException("解绑失败，请重试");
+        }
+        // 若删除的银行卡为默认银行卡，则需要设置其他一张卡为默认银行卡
+        int isDefault = bankCardVo.getIsDefault();
+        int removeFlag = companyBankCardDao.remove(bankCardVo);
+        if(removeFlag > 0){
+            if (CompanyBankCardConstant.IS_DEFAULT == isDefault) {
+                CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+                getReqVo.setCompanyId(bankCardVo.getCompanyId());
+                CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
+                if (StringHelper.isEmpty(companyBankCardVo)) {
+                    companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+                    companyBankCardDao.update(companyBankCardVo);
+                }
+            }
+        }
+    }
+
+    /**
+     * 设置该银行卡为默认支付，并取消其他银行卡的默认
+     *
+     * @param req 封装了银行卡id的请求对象
+     * @return
+     */
+    @Override
+    public void setDefaultBankCard(CompanyBankCardReqVo req) {
+        // 查询银行卡
+        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(req, CompanyBankCardVo.class);
+        if(StringHelper.isEmpty(companyBankCardVo)){
+            throw new CodeException("银行卡未找到。");
+        }
+        // 将该公司下所有银行卡设为非默认
+        CompanyBankCardReqVo updateDefaultReqVo = new CompanyBankCardReqVo();
+        updateDefaultReqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
+        updateDefaultReqVo.setCompanyId(companyBankCardVo.getCompanyId());
+        companyBankCardDao.updateDefault(updateDefaultReqVo);
+
+        // 将该卡设置为默认银行卡
+        updateDefaultReqVo = new CompanyBankCardReqVo();
+        updateDefaultReqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
+        updateDefaultReqVo.setId(companyBankCardVo.getId());
+        companyBankCardDao.updateDefault(updateDefaultReqVo);
+    }
+
+}

src/main/java/com/pangding/web/authority/service/company/impl/CompanyRuleServiceImpl.java

+package com.pangding.web.authority.service.company.impl;
+
+import com.pangding.web.authority.dao.CompanyRuleDao;
+import com.pangding.web.authority.service.company.CompanyRuleService;
+import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
+import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.yanzuoguang.dao.TableAnnotation;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.DateHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class CompanyRuleServiceImpl implements CompanyRuleService {
+
+    @Autowired
+    private CompanyRuleDao companyRuleDao;
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveCompanyRule(List<CompanyRuleVo> companyRuleVoList, String companyId) {
+        // 删除现有的规则
+//        CompanyRuleVo delCompanyRuleVo = new CompanyRuleVo();
+//        delCompanyRuleVo.setCompanyId(companyId);
+//        companyRuleDao.remove(delCompanyRuleVo);
+        if (!StringHelper.isEmpty(companyRuleVoList) && companyRuleVoList.size() > 0) {
+            for (int i = 0; i < companyRuleVoList.size(); i++) {
+                CompanyRuleVo companyRuleVo = companyRuleVoList.get(i);
+                // 主键为空 生成主键
+                if (StringHelper.isEmpty(companyRuleVo.getCompanyRuleId())) {
+                    companyRuleVo.setCompanyRuleId(StringHelper.getNewID());
+                }
+                // 查询该规则是否存在
+                CompanyRuleVo sqlCompanyRuleVo = companyRuleDao.load(companyRuleVo.getCompanyRuleId(), CompanyRuleVo.class);
+                if (StringHelper.isEmpty(sqlCompanyRuleVo)) {
+                    sqlCompanyRuleVo = new CompanyRuleVo();
+                    ObjectHelper.writeWithFromClass(sqlCompanyRuleVo, companyRuleVo);
+                    sqlCompanyRuleVo.setCompanyId(companyId);
+                    sqlCompanyRuleVo.setCompanyRuleId(StringHelper.getNewID());
+                    companyRuleDao.create(sqlCompanyRuleVo);
+                } else {
+                    ObjectHelper.writeWithFromClass(sqlCompanyRuleVo, companyRuleVo);
+                    sqlCompanyRuleVo.setUpdateDate(DateHelper.getNow());
+                    companyRuleDao.update(sqlCompanyRuleVo);
+                }
+            }
+        }
+    }
+
+}

src/main/java/com/pangding/web/authority/service/company/impl/NewCompanyServiceImpl.java

+package com.pangding.web.authority.service.company.impl;
+
+import com.pangding.web.authority.dao.company.*;
+import com.pangding.web.authority.dao.CompanyRuleDao;
+import com.pangding.web.authority.feign.PayFeign;
+import com.pangding.web.authority.service.UserService;
+import com.pangding.web.authority.service.company.CompanyRuleService;
+import com.pangding.web.authority.service.company.NewCompanyService;
+import com.pangding.web.constant.CompanyConstant;
+import com.pangding.web.vo.product.req.merchant.MerchantRegVo;
+import com.pangding.web.vo.system.pd.company.*;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
+import com.pangding.web.vo.system.req.company.*;
+import com.pangding.web.vo.system.res.company.CompanyNumberResVo;
+import com.pangding.web.vo.system.res.company.CompanyPageResVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
+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 java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class NewCompanyServiceImpl implements NewCompanyService {
+
+    @Autowired
+    private CompanyDao companyDao;
+    @Autowired
+    private CompanyExtendDao companyExtendDao;
+    @Autowired
+    private CompanyBankCardDao companyBankCardDao;
+    @Autowired
+    private CompanyRuleDao companyRuleDao;
+    @Autowired
+    private CompanyExamineDao companyExamineDao;
+    @Autowired
+    private CompanyMerchantDao companyMerchantDao;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private CompanyRuleService companyRuleService;
+    @Autowired
+    private PayFeign payFeign;
+
+    @Override
+    public CompanyPageResVo findCompanyListPage(CompanyReqVo req) {
+        CompanyPageResVo companyPageResVo = new CompanyPageResVo();
+        // 公司分页列表
+        PageSizeData<CompanyResVo> pageSizeData = companyDao.findCompanyListPage(req);
+        companyPageResVo.setCompanyResVoPageSizeData(pageSizeData);
+        // 公司数量
+        CompanyNumberResVo companyNumberResVo = companyDao.findCompanyTotal(req);
+        companyPageResVo.setCompanyNumberResVo(companyNumberResVo);
+        return companyPageResVo;
+    }
+
+    @Override
+    public List<CompanyResVo> findCompanyList(CompanyReqVo req) {
+        List<CompanyResVo> companyResVoList = companyDao.findCompanyList(req);
+        return companyResVoList;
+    }
+
+    @Override
+    public CompanyResVo findCompany(CompanyReqVo req) {
+        // 获取公司信息
+        CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
+        if (StringHelper.isEmpty(companyResVo)) {
+            throw new CodeException("暂无公司信息");
+        }
+        // 查询公司信息审核信息
+        CompanyExamineVo companyExamineReqVo = new CompanyExamineVo();
+        companyExamineReqVo.setCompanyId(companyResVo.getId());
+        List<CompanyExamineVo> companyExamineVoList = companyExamineDao.loadList(companyExamineReqVo, CompanyExamineVo.class);
+        companyResVo.setCompanyExamineVoList(companyExamineVoList);
+
+        // 查询公司银行卡信息
+        CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
+        companyBankCardReqVo.setCompanyId(companyResVo.getId());
+        List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(companyBankCardReqVo, CompanyBankCardVo.class);
+        companyResVo.setCompanyBankCardVoList(companyBankCardVoList);
+
+        // 获取公司规则信息 提现规则
+        CompanyRuleReqVo companyRuleReqVo = new CompanyRuleReqVo();
+        companyRuleReqVo.setCompanyId(companyResVo.getId());
+        List<CompanyRuleVo> companyRuleVoList = companyRuleDao.loadList(companyRuleReqVo, CompanyRuleVo.class);
+        companyResVo.setCompanyRuleVoList(companyRuleVoList);
+
+        // 获取公司行业信息
+        CompanyMerchantVo companyMerchantReqVo = new CompanyMerchantVo();
+        companyMerchantReqVo.setCompanyId(companyResVo.getId());
+        List<CompanyMerchantVo> companyMerchantVoList = companyMerchantDao.loadList(companyMerchantReqVo, CompanyMerchantVo.class);
+        companyResVo.setCompanyMerchantVoList(companyMerchantVoList);
+
+        // 查询公司管理员信息
+        UserReqVo userReqVo = new UserReqVo();
+        userReqVo.setIsFirst(1);
+        userReqVo.setCompanyId(req.getId());
+        companyResVo.setUserVo(userService.queryUser(userReqVo));
+
+        // 查询公司角色信息
+//        RoleReqVo roleReqVo = new RoleReqVo();
+//        roleReqVo.setCompanyId(req.getId());
+//        RoleVo roleVo = roleDao.load(roleReqVo, RoleVo.class);
+
+        return null;
+    }
+
+
+    @Override
+    public ResponseResult<SaveCompanyReqVo> updateCompanyInfo(SaveCompanyReqVo req) {
+        // 返回参数
+        ResponseResult<SaveCompanyReqVo> responseResult = new ResponseResult<>();
+        // 查询公司信息
+        CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), CompanyResVo.class);
+        if (StringHelper.isEmpty(companyResVo)) {
+            // 公司信息为空
+            return ResponseResult.error("99", "注册信息有误");
+        }
+//        ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
+//        companyResVo.setAddress(req.getCompanyVo().getAddress());
+        companyResVo.setUpdateTime(DateHelper.getNow());
+        if (CompanyConstant.COMPANY_STATUS_BIND_PHONE < companyResVo.getStatus()) {
+            // 公司状态小于电话已绑定，已经通过通联实名认证，不可修改公司的基本信息
+        } else {
+            CompanyVo companyVo = new CompanyVo();
+            ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
+            ObjectHelper.writeWithFrom(companyVo, companyResVo);
+
+//            if (StringHelper.isEmpty(req.getCompanyVo().getCompanyName())) {
+//                companyResVo.setCompanyName(req.getMerchantVo().getName());
+//                if (PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()) {
+//                    companyResVo.setCompanyName(req.getMerchantVo().getName() + companyVo.getContactName());
+//                }
+//            }
+        }
+        // 调用通联实名制
+        SaveCompanyReqVo companyReqVo = new SaveCompanyReqVo();
+        companyReqVo.setCompanyVo(companyResVo);
+        companyReqVo.setVerifyCode(req.getVerifyCode());
+        switch (companyResVo.getCompanyType()) {
+            case CompanyConstant.COMPANY_TYPE_COMPANY:
+                // 公司  1判断银行卡id是否存在，存在则查询银行卡
+                CompanyBankCardVo companyBankCardVo = saveCompanyBank(companyResVo, req);
+                companyReqVo.setCompanyBankCardVo(companyBankCardVo);
+                break;
+        }
+        responseResult = payFeign.setCompanyInfo1(companyReqVo);
+        SaveCompanyReqVo saveCompanyReqVo = responseResult.getData();
+        ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
+
+
+        CompanyBankCardVo companyBankCardVo = responseResult.getData().getCompanyBankCardVo();
+        if (!StringHelper.isEmpty(companyBankCardVo)) {
+            if (StringHelper.isEmpty(responseResult.getData().getErrorMessage())) {
+                companyBankCardVo.setStatus(1);
+                companyBankCardVo.setBindingTime(DateHelper.getNow());
+                companyBankCardVo.setBindingCode("");
+            }
+            companyBankCardDao.update(companyBankCardVo);
+        }
+
+        // 保存行业商户信息 todo
+        Integer companyAttribute = saveCompanyMerchant(req.getMerchantRegVoList(), companyResVo.getId());
+        companyResVo.setCompanyAttribute(companyAttribute);
+        companyDao.update(companyResVo);
+
+        if (StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())) {
+            // 错误信息为空，发送验证码成功 修改信息成功
+            return responseResult;
+        } else {
+            return ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
+        }
+    }
+
+    /**
+     * 实名认证时保存银行卡信息
+     *
+     * @param companyResVo
+     * @param req
+     * @return
+     */
+    private CompanyBankCardVo saveCompanyBank(CompanyResVo companyResVo, SaveCompanyReqVo req) {
+        Date date = DateHelper.getDateTime(companyResVo.getCreateTime());
+        String bankId = StringHelper.getNewIdMD5(date, req.getCompanyVo().getId(), req.getCompanyBankCardVo().getBankCardCode());
+        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(bankId, CompanyBankCardVo.class);
+        if (StringHelper.isEmpty(companyBankCardVo)) {
+            companyBankCardVo = new CompanyBankCardVo();
+            ObjectHelper.writeWithFrom(companyBankCardVo, req.getCompanyBankCardVo());
+            companyBankCardVo.setId(bankId);
+            companyBankCardVo.setName(req.getCompanyVo().getContactName());
+            companyBankCardVo.setIdCard(req.getCompanyVo().getContactCode());
+            companyBankCardVo.setCompanyId(req.getCompanyVo().getId());
+            companyBankCardVo.setType(1);
+            companyBankCardVo.setStatus(0);
+            companyBankCardVo.setIsDefault(0);
+            companyBankCardDao.create(companyBankCardVo);
+        } else {
+            ObjectHelper.writeWithFrom(companyBankCardVo, req.getCompanyBankCardVo());
+            companyBankCardVo.setId(bankId);
+            companyBankCardDao.update(companyBankCardVo);
+        }
+        return companyBankCardVo;
+    }
+
+    public Integer saveCompanyMerchant(List<MerchantRegVo> merchantRegVoList, String companyId) {
+        Integer companyAttribute = 0;
+        // 删除当前公司的所有行业属性
+        CompanyMerchantVo delCompanyMerchantVo = new CompanyMerchantVo();
+        delCompanyMerchantVo.setCompanyId(companyId);
+        companyMerchantDao.remove(delCompanyMerchantVo);
+
+        // 新增当前公司的行业属性
+        List<CompanyMerchantVo> companyMerchantVoList = new ArrayList<>();
+        for (MerchantRegVo merchantRegVo : merchantRegVoList) {
+            CompanyMerchantVo companyMerchantVo = new CompanyMerchantVo();
+            if (StringHelper.isEmpty(merchantRegVo.getMerchantId())) {
+                companyMerchantVo.setMerchantId(StringHelper.getNewID());
+            }
+            companyMerchantVo.setCompanyMerchantId(StringHelper.getNewID());
+            companyMerchantVo.setCompanyId(companyId);
+            companyMerchantVo.setMerchantType(merchantRegVo.getMerchantType());
+            companyMerchantVo.setTitleName(merchantRegVo.getTitleName());
+            merchantRegVo.setMerchantId(companyMerchantVo.getMerchantId());
+            companyMerchantVoList.add(companyMerchantVo);
+//            companyAttribute = merchantRegVo.getMerchantTypeName();
+        }
+        companyMerchantDao.saveArray(companyMerchantVoList);
+
+        // todo 调用运营保存商户信息
+//        if (PangdConstant.ATTRIBUTE_TAXI != companyResVo.getCompanyAttribute()) {
+//            /*保存或更新商户表*/
+//            MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
+//            ObjectHelper.writeWithFrom(merchantCreateReqVo, req.getMerchantVo());
+//            merchantCreateReqVo.setAddress(req.getCompanyVo().getAddress());
+//            merchantCreateReqVo.setType(req.getCompanyVo().getCompanyAttribute());
+//            merchantCreateReqVo.setProductCompanyId(companyResVo.getId());
+//            merchantCreateReqVo.setProductCompanyName(req.getCompanyVo().getCompanyName());
+//            merchantCreateReqVo.setUserId(req.getUserVo().getId());
+//            merchantCreateReqVo.setUsername(req.getUserVo().getAccount());
+//            merchantCreateReqVo.setReqId(StringHelper.getNewID());
+//            merchantCreateReqVo.setCreateTime(DateHelper.getNow());
+//
+//            if (!StringHelper.isEmpty(merchantCreateReqVo.getId())) {
+//                merchantCreateReqVo.setId(StringHelper.getNewID());
+//            }
+//            ResponseResult<MerchantVo> merchantResponseResult = storeFeign.merchantCreate(merchantCreateReqVo);
+//            if (merchantResponseResult.getCode().equals("00")) {
+//                MerchantVo merchantVo = merchantResponseResult.getData();
+//                saveCompanyReqVo.setMerchantVo(merchantVo);
+//            }
+//        }
+        return companyAttribute;
+    }
+
+
+    /**
+     * 检查邀请码是否正确
+     *
+     * @param invitationCode
+     */
+    public CompanyResVo checkInvitationCode(String invitationCode) {
+        // 验证邀请码是否正确 todo 关联码怎么判断
+        CompanyReqVo req = new CompanyReqVo();
+        req.setInvitationCode(invitationCode);
+        CompanyResVo companyResVo = companyDao.findCompany(req);
+        if (StringHelper.isEmpty(companyResVo)) {
+            // 邀请码不正确
+            throw new CodeException("注册编码错误.");
+        }
+        // 如果子级邀请码不为空 并且等于用户填写的邀请码 设置邀请码类型
+        if (!StringHelper.isEmpty(companyResVo.getChildInvitationCode()) && companyResVo.getChildInvitationCode().equals(invitationCode)) {
+            companyResVo.setInvitationCodeType(CompanyConstant.RELATION_CODE);
+        }
+        if (!StringHelper.isEmpty(companyResVo.getInvitationCode()) && companyResVo.getInvitationCode().equals(invitationCode)) {
+            companyResVo.setInvitationCodeType(CompanyConstant.INVITATION_CODE);
+
+            // 判断邀请公司状态
+            if (0 == companyResVo.getInvitationStatus() || 1 != companyResVo.getExamineStatus()) {
+                throw new CodeException("用户邀请状态错误：" + companyResVo.getInvitationStatus() + ",状态错误：" + companyResVo.getExamineStatus());
+            }
+            // 判断该账户已经邀请的人数
+            if (companyResVo.getInviteesPeople() <= companyResVo.getInvitedPeople()) {
+                throw new CodeException("邀请人数已超过可邀请人数，注册失败。可邀请人数为：" + companyResVo.getInviteesPeople());
+            }
+            // 添加用户邀请人数
+            UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
+            updateCompanyMoneyReqVo.setCompanyId(companyResVo.getId());
+            updateCompanyMoneyReqVo.setInvitedPeople(1);
+            companyExtendDao.updateCompanyInvitedPeople(updateCompanyMoneyReqVo);
+        }
+
+        return companyResVo;
+    }
+
+    public void examineCompany(ExamineCompanyReqVo req) {
+        // 找到公司信息
+        CompanyResVo companyResVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);
+        if (StringHelper.isEmpty(companyResVo)) {
+            throw new CodeException("公司信息错误");
+        }
+        CompanyExtendVo companyExtendVo = new CompanyExtendVo();
+        ObjectHelper.writeWithFromClass(companyExtendVo, companyResVo);
+        ObjectHelper.writeWithFromClass(companyExtendVo, req);
+        companyExtendDao.update(companyExtendVo);
+
+        // 保存公司行业信息
+        saveCompanyMerchant(req.getMerchantRegVoList(), companyResVo.getId());
+
+        // 更新或新增提现规则表
+        companyRuleService.saveCompanyRule(req.getCompanyRuleVoList(), companyResVo.getId());
+
+        //保存审核信息
+        saveCompanyExamin(null, companyResVo.getId());
+
+        // 公司激活状态 审核通过状态 公司邀请奖励
+//        if (1 == reqVo.getActivationStatus() && 1 == reqVo.getExamineStatus()) {
+//            CompanyResVo companyResVo = new CompanyResVo();
+//            ObjectHelper.writeWithFromClass(companyResVo, companyVo);
+//            ObjectHelper.writeWithFromClass(companyResVo, companyExtendVo);
+//            companyResVo.setRewardType(CompanyConstant.CATEGORY_ACTIVATION_BONUS);
+//            companyConsumer.companyReward(companyResVo);
+//        }
+        // 公司审核通过 同步给大数据平台
+//        if (1 == reqVo.getExamineStatus()) {
+//            CompanyResVo companyResVo = new CompanyResVo();
+//            ObjectHelper.writeWithFromClass(companyResVo, companyVo);
+//            ObjectHelper.writeWithFromClass(companyResVo, companyExtendVo);
+//            companyConsumer.synCompany(companyResVo);
+//        }
+
+    }
+
+    public void saveCompanyExamin(List<CompanyExamineVo> companyExamineVoList, String companyId) {
+
+        // 删除当前公司的审核信息
+        CompanyExamineVo delCompanyExaminVo = new CompanyExamineVo();
+        delCompanyExaminVo.setCompanyId(companyId);
+        companyExamineDao.remove(delCompanyExaminVo);
+
+        // 新增当前公司的审核信息
+        List<CompanyExamineVo> saveCompanyExamineVoList = new ArrayList<>();
+        for (int i = 0; i < companyExamineVoList.size(); i++) {
+            CompanyExamineVo companyExamineVo = companyExamineVoList.get(i);
+            CompanyExamineVo sqlCompanyExamineVo = new CompanyExamineVo();
+            ObjectHelper.writeWithFromClass(sqlCompanyExamineVo, companyExamineVo);
+            sqlCompanyExamineVo.setCompanyId(companyId);
+            sqlCompanyExamineVo.setCompanyExamineId(StringHelper.getNewID());
+            saveCompanyExamineVoList.add(sqlCompanyExamineVo);
+        }
+        companyExamineDao.saveArray(saveCompanyExamineVoList);
+    }
+}

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

@@ -4,13 +4,11 @@ import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.util.RoleConstant;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.AuthorityService;
-import com.pangding.web.authority.vo.*;
-import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityResVo;
 import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.pangding.web.vo.system.pd.authority.*;
-import com.pangding.web.vo.system.res.authority.RoleAuthorityLoadResVo;
+import com.pangding.web.vo.system.res.authority.AuthorityListByLevelResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;

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

 package com.pangding.web.authority.service.impl;
 
-import com.pangding.web.authority.dao.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
 import com.pangding.web.authority.service.CompanyNewService;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.feign.WxFeign;
@@ -19,10 +22,10 @@ import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.constant.PangdConstant;
 import com.pangding.web.util.RSAUtils;
-import com.pangding.web.vo.order.pd.CapitalFlowVo;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.order.res.CapitalFlowResVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
+import com.pangding.web.vo.product.req.merchant.MerchantRegVo;
 import com.pangding.web.vo.system.pd.CompanyMsgVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
 import com.pangding.web.vo.system.pd.authority.UserRoleVo;
@@ -114,8 +117,8 @@ public class CompanyServiceImpl implements CompanyService {
      * @return 公司列表分页对象
      */
     @Override
-    public PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo) {
-        PageSizeData<CompanyResVo> pageSizeData = companyDao.getCompanyList(reqVo);
+    public PageSizeData<CompanyResVo> list(CompanyReqVo reqVo) {
+        PageSizeData<CompanyResVo> pageSizeData = companyDao.findCompanyListPage(reqVo);
         if (null == pageSizeData || null == pageSizeData.getList() || pageSizeData.getList().isEmpty()) {
             throw new CodeException("暂无公司信息");
         }
@@ -245,7 +248,7 @@ public class CompanyServiceImpl implements CompanyService {
         if (!StringHelper.isEmpty(companyVo)) {
             resVo.setCompanyVo(companyVo);
 
-            if(PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()){
+            if (PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()) {
                 /*此处需要根据公司id和productOrInterface获取商户信息*/
                 CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
                 companyScenicInfoReqVo.setCompanyId(companyVo.getId());
@@ -306,9 +309,7 @@ public class CompanyServiceImpl implements CompanyService {
             resVo.setPaydJumpUrl(getJumpUrl(companyVo));
 
             // 查询公司用户信息和角色信息
-
         }
-
         return resVo;
     }
 
@@ -672,9 +673,9 @@ public class CompanyServiceImpl implements CompanyService {
             CompanyBankCardReqVo resVo = result.getData();
             ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
 //            companyBankCardVo.setIsDefault(reqVo.getIsDefault());
-            BankCardListReqVo reqVo1 = new BankCardListReqVo();
+            CompanyBankCardReqVo reqVo1 = new CompanyBankCardReqVo();
             reqVo1.setCompanyId(reqVo.getCompanyId());
-            PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
+            PageSizeData<CompanyBankCardResVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardListPage(reqVo1);
             /*若该银行卡是第一张银行卡，则设为默认*/
             if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()) {
                 reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
@@ -729,16 +730,22 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void setDefault(CompanyBankCardVo reqVo) {
-        /*获取该银行卡的公司id*/
+        // 查询银行卡
         CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(reqVo, CompanyBankCardVo.class);
-        String companyId = companyBankCardVo.getCompanyId();
-        /*现将该公司其他银行卡设为非默认*/
-        CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo = new CompanyBankCardSetNotDefaultReqVo();
-        setNotDefaultReqVo.setCompanyId(companyId);
-        companyBankCardDao.setNotDefault(setNotDefaultReqVo);
-        /*将该卡设置为默认银行卡并更新*/
-        companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
-        companyBankCardDao.update(companyBankCardVo);
+        if(StringHelper.isEmpty(companyBankCardVo)){
+            throw new CodeException("银行卡未找到。");
+        }
+        // 将该公司下所有银行卡设为非默认
+        CompanyBankCardReqVo updateDefaultReqVo = new CompanyBankCardReqVo();
+        updateDefaultReqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
+        updateDefaultReqVo.setCompanyId(companyBankCardVo.getCompanyId());
+        companyBankCardDao.updateDefault(updateDefaultReqVo);
+
+        // 将该卡设置为默认银行卡
+        updateDefaultReqVo = new CompanyBankCardReqVo();
+        updateDefaultReqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
+        updateDefaultReqVo.setId(companyBankCardVo.getId());
+        companyBankCardDao.updateDefault(updateDefaultReqVo);
     }
 
     /**
@@ -825,9 +832,9 @@ public class CompanyServiceImpl implements CompanyService {
             companyCodeVo.setCreateTime(DateHelper.getNow());
             companyCodeVo.setMsgGroupId(msgGroupId);
             companyCodeVo.setCodeStatus(0);
-            if(5 == codeType){
+            if (5 == codeType) {
                 companyCodeVo.setCodeLink(miniPayUrl.replace("COMPANYID", companyResVo.getId()));
-            }else{
+            } else {
                 String code = DateHelper.getNow()
                         .replace("-", "")
                         .replace(":", "")
@@ -839,9 +846,9 @@ public class CompanyServiceImpl implements CompanyService {
             companyCodeDao.create(companyCodeVo);
         }
         if (StringHelper.isEmpty(companyCodeVo.getCodeCode())) {
-            if(5 == codeType){
+            if (5 == codeType) {
                 companyCodeVo.setCodeLink(miniPayUrl.replace("COMPANYID", companyResVo.getId()));
-            }else{
+            } else {
                 String code = DateHelper.getNow()
                         .replace("-", "")
                         .replace(":", "")
@@ -853,13 +860,13 @@ public class CompanyServiceImpl implements CompanyService {
             }
             companyCodeDao.update(companyCodeVo);
         }
-        if (StringHelper.isEmpty(companyCodeVo.getCodeImgUrl()) && 5!= codeType) {
+        if (StringHelper.isEmpty(companyCodeVo.getCodeImgUrl()) && 5 != codeType) {
             // 获取微信二维码
             companyCodeVo = getWeixinCode(0, companyCodeVo);
             companyCodeVo.setMsgGroupId(msgGroupId);
             companyCodeDao.update(companyCodeVo);
         }
-        if(5 != codeType){
+        if (5 != codeType) {
             com.pangding.web.vo.system.req.CompanyMsgReqVo companyMsgReqVo = new com.pangding.web.vo.system.req.CompanyMsgReqVo();
             companyMsgReqVo.setCompanyId(companyCodeVo.getCompanyId());
             companyMsgReqVo.setMsgId(msgGroupId);
@@ -918,9 +925,9 @@ public class CompanyServiceImpl implements CompanyService {
      * @return 银行卡列表分页对象
      */
     @Override
-    public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
+    public PageSizeData<CompanyBankCardResVo> getBankCardList(CompanyBankCardReqVo reqVo) {
 
-        PageSizeData<CompanyBankCardVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardList(reqVo);
+        PageSizeData<CompanyBankCardResVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardListPage(reqVo);
 //        if (companyBankCardVoPageSizeData == null || companyBankCardVoPageSizeData.getList().isEmpty()) {
 //            throw new CodeException("暂无银行卡，请先添加");
 //        }
@@ -1038,9 +1045,9 @@ public class CompanyServiceImpl implements CompanyService {
      * @return
      */
     @Override
-    public PageSizeData<CompanyResVo> myInvite(ListCompanyReqVo reqVo) {
+    public PageSizeData<CompanyResVo> myInvite(CompanyReqVo reqVo) {
         reqVo.setStatus(6);
-        return companyDao.getCompanyList(reqVo);
+        return companyDao.findCompanyListPage(reqVo);
     }
 
     @Override
@@ -1216,7 +1223,7 @@ public class CompanyServiceImpl implements CompanyService {
             companyConsumer.companyReward(companyResVo);
         }
 
-        if ( 1 == reqVo.getExamineStatus()) {
+        if (1 == reqVo.getExamineStatus()) {
             // 公司审核通过 同步给大数据平台
             CompanyResVo companyResVo = new CompanyResVo();
             ObjectHelper.writeWithFromClass(companyResVo, companyVo);
@@ -1282,9 +1289,9 @@ public class CompanyServiceImpl implements CompanyService {
 
 
     @Override
-    public FindCompanyBalanceResVo findCompanyBalance(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
+    public FindCompanyBalanceResVo findCompanyBalance(CompanyReqVo req) {
 
-        com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(req.getId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
+        CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
 
         CompanyExtendResVo companyExtendResVo = companyExtendDao.load(req.getId(), CompanyExtendResVo.class);
 
@@ -1298,11 +1305,11 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
 
-    public void automaticCashWithdrawal(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
-        PageSizeData<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoPageSizeData = companyExtendDao.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyExtendVo.class);
-        List<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoList = companyExtendVoPageSizeData.getList();
-        PageSizeData<com.pangding.web.vo.system.pd.company.CompanyVo> companyVoPageSizeData = companyDao.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyVo.class);
-        List<com.pangding.web.vo.system.pd.company.CompanyVo> companyVoList = companyVoPageSizeData.getList();
+    public void automaticCashWithdrawal(CompanyReqVo req) {
+        PageSizeData<CompanyExtendVo> companyExtendVoPageSizeData = companyExtendDao.loadPage(req, CompanyExtendVo.class);
+        List<CompanyExtendVo> companyExtendVoList = companyExtendVoPageSizeData.getList();
+        PageSizeData<CompanyVo> companyVoPageSizeData = companyDao.loadPage(req, CompanyVo.class);
+        List<CompanyVo> companyVoList = companyVoPageSizeData.getList();
         for (int i = 0; i < companyExtendVoList.size(); i++) {
             com.pangding.web.vo.system.pd.company.CompanyExtendVo companyExtendVo = companyExtendVoList.get(i);
             String companyId = companyExtendVoList.get(i).getId();
@@ -1329,9 +1336,9 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public ResponseResult<com.pangding.web.vo.system.req.company.SaveCompanyReqVo> updateCompanyInfo(com.pangding.web.vo.system.req.company.SaveCompanyReqVo req) {
-        ResponseResult<com.pangding.web.vo.system.req.company.SaveCompanyReqVo> responseResult = new ResponseResult<>();
-        com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
+    public ResponseResult<SaveCompanyReqVo> updateCompanyInfo(SaveCompanyReqVo req) {
+        ResponseResult<SaveCompanyReqVo> responseResult = new ResponseResult<>();
+        CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), CompanyResVo.class);
         if (StringHelper.isEmpty(companyResVo)) {
             // 公司信息为空
             return ResponseResult.error("99", "注册信息有误");
@@ -1347,19 +1354,19 @@ public class CompanyServiceImpl implements CompanyService {
             ObjectHelper.writeWithFrom(companyVo, companyResVo);
             if (StringHelper.isEmpty(req.getCompanyVo().getCompanyName())) {
                 companyResVo.setCompanyName(req.getMerchantVo().getName());
-                if(PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()){
+                if (PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()) {
                     companyResVo.setCompanyName(req.getMerchantVo().getName() + companyVo.getContactName());
                 }
             }
         }
-        if (com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()) {
+        if (CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()) {
             // 个人 TODO 调用通联实名制
-            com.pangding.web.vo.system.req.company.SaveCompanyReqVo companyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
+            SaveCompanyReqVo companyReqVo = new SaveCompanyReqVo();
             companyReqVo.setCompanyVo(companyResVo);
             companyReqVo.setVerifyCode(req.getVerifyCode());
             responseResult = payFeign.setCompanyInfo1(companyReqVo);
         }
-        if (com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_COMPANY == companyResVo.getCompanyType()) {
+        if (CompanyConstant.COMPANY_TYPE_COMPANY == companyResVo.getCompanyType()) {
             // 公司
             // 找到银行卡 TODO 1判断银行卡id是否存在，存在则查询银行卡
             Date date = DateHelper.getDateTime(companyResVo.getCreateTime());
@@ -1382,7 +1389,7 @@ public class CompanyServiceImpl implements CompanyService {
                 companyBankCardDao.update(companyBankCardVo);
             }
             // Todo 调用通联设置公司信息
-            com.pangding.web.vo.system.req.company.SaveCompanyReqVo companyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
+            SaveCompanyReqVo companyReqVo = new SaveCompanyReqVo();
             companyReqVo.setCompanyVo(companyResVo);
 
             companyReqVo.setCompanyBankCardVo(companyBankCardVo);
@@ -1396,10 +1403,22 @@ public class CompanyServiceImpl implements CompanyService {
             }
             companyBankCardDao.update(companyBankCardVo);
         }
-        com.pangding.web.vo.system.req.company.SaveCompanyReqVo saveCompanyReqVo = responseResult.getData();
+        SaveCompanyReqVo saveCompanyReqVo = responseResult.getData();
         ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
         companyDao.update(companyResVo);
 
+        // 保存行业商户信息 todo
+        List<MerchantRegVo> merchantRegVoList = req.getMerchantRegVoList();
+        List<CompanyMerchantVo> companyMerchantVoList = new ArrayList<>();
+        for(MerchantRegVo merchantRegVo : merchantRegVoList){
+            CompanyMerchantVo companyMerchantVo = new CompanyMerchantVo();
+            companyMerchantVo.setCompanyMerchantId(StringHelper.getNewID());
+            companyMerchantVo.setCompanyId(req.getCompanyVo().getId());
+            companyMerchantVo.setMerchantType(merchantRegVo.getMerchantType());
+            companyMerchantVo.setTitleName(merchantRegVo.getTitleName());
+            companyMerchantVoList.add(companyMerchantVo);
+        }
+
         if (PangdConstant.ATTRIBUTE_TAXI != companyResVo.getCompanyAttribute()) {
             /*保存或更新商户表*/
             MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
@@ -1570,7 +1589,7 @@ public class CompanyServiceImpl implements CompanyService {
     public CompanyResVo findCompanyInvitationReward(CompanyReqVo req) {
 
         CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
-        if(!StringHelper.isEmpty(companyResVo) && !StringHelper.isEmpty(companyResVo.getInvitationCompanyId())){
+        if (!StringHelper.isEmpty(companyResVo) && !StringHelper.isEmpty(companyResVo.getInvitationCompanyId())) {
             companyResVo = companyDao.load(req.getInvitationCompanyId(), CompanyResVo.class);
             if (!StringHelper.isEmpty(companyResVo)) {
                 CompanyInvitationRuleVo companyInvitationRuleReqVo = new CompanyInvitationRuleVo();
@@ -1585,7 +1604,7 @@ public class CompanyServiceImpl implements CompanyService {
 
     @Override
     public List<CompanyVo> findAllCompany(CompanyReqVo req) {
-        List<CompanyVo> list = companyDao.loadList(req,CompanyVo.class);
+        List<CompanyVo> list = companyDao.loadList(req, CompanyVo.class);
         return list;
     }
 }

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.service.DataService;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.mq.CompanyConsumer;
 import com.pangding.web.authority.service.FinanceService;
 import com.pangding.web.authority.vo.reqvo.CompanyExtendGetReqVo;

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

 package com.pangding.web.authority.service.impl;
 
-import com.pangding.web.authority.dao.CompanyExtendDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.dao.WechatUserDao;
 import com.pangding.web.authority.service.IndexService;
 import com.pangding.web.authority.util.TimeConstant;

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.service.PangdingPartnerService;
-import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.util.CompanyBankCardConstant;
 import com.pangding.web.authority.util.ShareCodeUtil;
 import com.pangding.web.authority.vo.*;
@@ -24,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.feign.StoreFeign;
-import com.pangding.web.authority.mq.CompanyConsumer;
 import com.pangding.web.authority.service.*;
 import com.pangding.web.authority.util.*;
-import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
-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.constant.CompanyConstant;
-import com.pangding.web.mq.CompanyProducer;
 import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.LoginTokenVo;
@@ -22,8 +20,12 @@ import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.LoginReqVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
+import com.pangding.web.vo.system.res.LoginResVo;
+import com.pangding.web.vo.system.res.authority.AuthorityListByLevelResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
+import com.pangding.web.vo.system.res.company.LoginCompanyResVo;
 import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -78,9 +80,6 @@ public class RegisterServiceImpl implements RegisterService {
     private TokenService tokenService;
     @Autowired
     private CompanyService companyService;
-    @Autowired
-    private CompanyProducer companyProducer;
-
 
     /**
      * 判断注册编码是否存在
@@ -394,22 +393,23 @@ public class RegisterServiceImpl implements RegisterService {
      */
     @Override
     public LoginResVo login(LoginReqVo reqVo) throws Exception {
-        String accountOrPhone = reqVo.getAccountOrPhone();
-        UserVo userVo;
-        if (userService.isNumeric(accountOrPhone)) {
-            userVo = userService.getUserByPhone(accountOrPhone);
-        } else {
-            userVo = userService.getUserByAccount(accountOrPhone);
-        }
-        if (userVo == null) {
+
+        UserReqVo userReqVo = new UserReqVo();
+        userReqVo.setLoginAccount(reqVo.getAccountOrPhone());
+        UserVo userVo = userService.queryUser(userReqVo);
+        if (StringHelper.isEmpty(userVo)) {
             throw new CodeException("用户名不存在");
         }
-
         /*通过私钥将rsa加密的密码解密*/
         String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(), RsaConstant.privateKey);
         if (!(StringHelper.md5(password).equals(userVo.getPassword()))) {
             throw new CodeException("用户名或密码错误");
         }
+
+        if (StringHelper.isEmpty(userVo.getCompanyId())) {
+            throw new CodeException("用户信息有误，请联系管理员");
+        }
+
         String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
 
         // 登录返回参数
@@ -429,9 +429,6 @@ public class RegisterServiceImpl implements RegisterService {
         // 输出结果
         TokenHelper.write(token, loginVo);
 
-        if (StringHelper.isEmpty(userVo.getCompanyId())) {
-            throw new CodeException("用户信息有误，请联系管理员");
-        }
         // 找到登录用户公司信息
         CompanyResVo companyVo = companyDao.load(userVo.getCompanyId(), CompanyResVo.class);
         if (StringHelper.isEmpty(companyVo)) {
@@ -441,7 +438,7 @@ public class RegisterServiceImpl implements RegisterService {
         loginCompanyResVo.setCompanyVo(companyVo);
         reqVo.setToken(token);
 
-        // 找到公司银行信息
+        // 找到公司银行信息 todo  登录的时候是否需要银行卡列表
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         getReqVo.setCompanyId(companyVo.getId());
         List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(getReqVo, CompanyBankCardVo.class);
@@ -450,7 +447,7 @@ public class RegisterServiceImpl implements RegisterService {
         loginCompanyResVo.setCompanyBankCardVo(companyBankCardVo);
         resVo.setCompanyResVo(loginCompanyResVo);
 
-        /*获取商家信息*/
+        //获取商家信息 todo  登录的时候是否需要银行卡列表
         CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
         companyScenicInfoReqVo.setReqId(StringHelper.getNewID());
         companyScenicInfoReqVo.setCompanyId(companyVo.getId());

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
-import com.pangding.web.authority.service.CompanyService;
+import com.pangding.web.authority.dao.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
+import com.pangding.web.authority.dao.company.CompanyMerchantDao;
+import com.pangding.web.authority.feign.StoreFeign;
+import com.pangding.web.authority.service.TokenService;
+import com.pangding.web.authority.service.company.NewCompanyService;
 import com.pangding.web.authority.util.RsaConstant;
+import com.pangding.web.authority.util.TokenUtil;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
@@ -10,23 +17,28 @@ import com.pangding.web.constant.AuthorityConstant;
 import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.constant.PangdConstant;
 import com.pangding.web.util.RSAUtils;
-import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
-import com.pangding.web.vo.system.pd.authority.RoleVo;
-import com.pangding.web.vo.system.pd.authority.UserRoleVo;
-import com.pangding.web.vo.system.pd.authority.UserVo;
+import com.pangding.web.vo.product.pd.merchant.MerchantVo;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
+import com.pangding.web.vo.system.pd.authority.*;
+import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
+import com.pangding.web.vo.system.pd.company.CompanyMerchantVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.req.LoginReqVo;
 import com.pangding.web.vo.system.req.authority.AuthorityReqVo;
 import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
 import com.pangding.web.vo.system.req.authority.UserReqVo;
-import com.pangding.web.vo.system.req.company.CompanyExtendReqVo;
-import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
+import com.pangding.web.vo.system.res.LoginResVo;
+import com.pangding.web.vo.system.res.authority.AuthorityListByLevelResVo;
 import com.pangding.web.vo.system.res.authority.AuthorityResVo;
-import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
+import com.pangding.web.vo.system.res.authority.UserResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
+import com.pangding.web.vo.system.res.company.LoginCompanyResVo;
+import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
+import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -50,15 +62,244 @@ public class UserServiceImpl implements UserService {
     @Autowired
     RoleDao roleDao;
     @Autowired
-    private AuthorityDao authorityDao;
-    @Autowired
     private RoleAuthorityDao roleAuthorityDao;
     @Autowired
+    private AuthorityDao authorityDao;
+    @Autowired
     private CompanyDao companyDao;
     @Autowired
     private CompanyExtendDao companyExtendDao;
     @Autowired
-    private CompanyService companyService;
+    private CompanyBankCardDao companyBankCardDao;
+    @Autowired
+    private CompanyMerchantDao companyMerchantdao;
+    @Autowired
+    private NewCompanyService newCompanyService;
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private StoreFeign storeFeign;
+
+
+    /**
+     * 登陆，验证用户名或手机号，密码是否正确
+     * 返回token,account,LoginCompanyResVo对象（id：公司id,status：公司状态,companyAttribute：属性,bankCardCodeList：绑定的银行卡数组）
+     *
+     * @param reqVo
+     * @return
+     */
+    @Override
+    public LoginResVo login(LoginReqVo reqVo) {
+
+        // 查询用户是否存在
+        UserReqVo userReqVo = new UserReqVo();
+        userReqVo.setLoginAccount(reqVo.getAccountOrPhone());
+        UserVo userVo = userDao.queryUser(userReqVo);
+        if (StringHelper.isEmpty(userVo)) {
+            throw new CodeException("用户名不存在");
+        }
+        //通过私钥将rsa加密的密码解密 并检查密码是否相等
+        try {
+            String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(), RsaConstant.privateKey);
+            if (!(StringHelper.md5(password).equals(userVo.getPassword()))) {
+                throw new CodeException("用户名或密码错误");
+            }
+        } catch (Exception e) {
+            throw new CodeException(e.getMessage());
+        }
+
+        if (StringHelper.isEmpty(userVo.getCompanyId())) {
+            throw new CodeException("用户信息有误，请联系管理员");
+        }
+
+        String token = TokenUtil.createToken(reqVo.getAccountOrPhone());
+
+        // 登录返回参数
+        LoginResVo resVo = new LoginResVo();
+        resVo.setToken(token);
+        userVo.setPassword("");
+        userVo.setRemark("");
+        resVo.setUserVo(userVo);
+
+        // 保存登录token
+        LoginTokenVo loginVo = new LoginTokenVo();
+        loginVo.setToken(token);
+        loginVo.setDataPwd(token);
+        loginVo.setData(JsonHelper.serialize(reqVo));
+        loginVo.setExpairTime(DateHelper.getNow());
+        tokenService.save(loginVo);
+        // 输出结果
+        TokenHelper.write(token, loginVo);
+
+        // 找到登录用户公司信息
+        CompanyResVo companyVo = companyDao.load(userVo.getCompanyId(), CompanyResVo.class);
+        if (StringHelper.isEmpty(companyVo)) {
+            throw new CodeException("注册信息有误");
+        }
+        LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
+        loginCompanyResVo.setCompanyVo(companyVo);
+        reqVo.setToken(token);
+
+        // 找到公司银行信息
+        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+        getReqVo.setCompanyId(companyVo.getId());
+        getReqVo.setIsDefault(1);
+        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
+        loginCompanyResVo.setCompanyBankCardVo(companyBankCardVo);
+        resVo.setCompanyResVo(loginCompanyResVo);
+
+        // 找到公司的行业属性
+        CompanyMerchantVo companyMerchantReqVo = new CompanyMerchantVo();
+        companyMerchantReqVo.setCompanyId(companyVo.getId());
+        List<CompanyMerchantVo> companyMerchantVoList = companyMerchantdao.loadList(companyMerchantReqVo, CompanyMerchantVo.class);
+        loginCompanyResVo.setCompanyMerchantVoList(companyMerchantVoList);
+
+        //获取商家信息 todo  登录的时候是否需要商户信息
+        CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
+        companyScenicInfoReqVo.setReqId(StringHelper.getNewID());
+        companyScenicInfoReqVo.setCompanyId(companyVo.getId());
+        companyScenicInfoReqVo.setProductOrInterface(0);
+        try {
+            ResponseResult result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
+            MerchantVo merchant = (MerchantVo) result.getData();
+            resVo.setMerchant(merchant);
+        } catch (Exception e) {
+            resVo.setMerchant(null);
+        }
+
+        // 判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面
+        if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON == (companyVo.getCompanyType())) {
+            resVo.setCode("01");
+            resVo.setMsg("个人基本信息未完善，跳转个人完善页面");
+            return resVo;
+        }
+        // 判断基本信息是否完善，及状态是否为2，且为公司用户，若不完善则跳转个人完善页面
+        else if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && (CompanyConstant.COMPANY_TYPE_COMPANY == (companyVo.getCompanyType()))) {
+            resVo.setCode("02");
+            resVo.setMsg("公司基本信息未完善，跳转公司完善页面");
+            return resVo;
+        }
+
+        /*获取用户权限列表*/
+        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+        roleAuthorityGetReqVo.setUserId(userVo.getId());
+        List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
+        resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
+
+        resVo.setCompanyResVo(loginCompanyResVo);
+
+        resVo.setCode("00");
+        return resVo;
+    }
+
+    @Override
+    @Transactional(rollbackFor = RuntimeException.class)
+    public ResponseResult<String> registerSaveUser(SaveUserReqVo saveUserReqVo) {
+        // 用户名是否存在
+        UserReqVo userReqVo = new UserReqVo();
+        userReqVo.setAccount(saveUserReqVo.getAccount());
+        UserVo userVo = userDao.load(userReqVo, UserVo.class);
+        if (!StringHelper.isEmpty(userVo)) {
+            // 用户名已存在
+            return ResponseResult.error("99", "该用户名已存在");
+        }
+        try {
+            /*将RSA加密后的密码解密*/
+            String password = saveUserReqVo.getPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
+            String confirmPassword = saveUserReqVo.getConfirmPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
+            if (!StringHelper.compare(password, confirmPassword)) {
+                return ResponseResult.error("99", "两次填写的密码不相等");
+            }
+
+            // 验证邀请码是否正确 todo 关联码怎么判断
+            CompanyResVo companyResVo = newCompanyService.checkInvitationCode(saveUserReqVo.getInvitationCode());
+
+            String companyId = StringHelper.getNewID();
+            String userId = StringHelper.getNewID();
+
+            // 保存用户表
+            userVo = new UserVo();
+            userVo.setId(userId);
+            userVo.setAccount(saveUserReqVo.getAccount());
+            userVo.setPassword(this.passwordEncoder(password));
+            userVo.setRemark(password);
+            userVo.setCompanyId(companyId);
+            userVo.setName(saveUserReqVo.getName());
+            userVo.setPhone(saveUserReqVo.getPhone());
+            userVo.setCreateTime(DateHelper.getNow());
+            userVo.setCreateId(userId);
+            userVo.setCreateName(saveUserReqVo.getAccount());
+            userVo.setStatus(0);
+            userDao.create(userVo);
+
+            // 保存公司表
+            CompanyVo companyVo = new CompanyVo();
+            companyVo.setId(companyId);
+            companyVo.setInvitationCompanyId(companyResVo.getId());
+            companyVo.setInvitationCompanyName(companyResVo.getCompanyName());
+            companyVo.setInvitationCodeType(companyResVo.getInvitationCodeType());
+            if(CompanyConstant.RELATION_CODE == companyResVo.getInvitationCodeType()){
+                // 邀请码为关联码  需关联父级
+                companyVo.setPid(companyResVo.getId());
+                companyVo.setPcompanyName(companyResVo.getCompanyName());
+            }
+            companyVo.setStatus(CompanyConstant.COMPANY_STATUS_INIT);
+            companyVo.setNature(saveUserReqVo.getCompanyType());
+            if (3 == companyVo.getNature()) {
+                companyVo.setCompanyType(0);
+            } else {
+                companyVo.setCompanyType(1);
+            }
+            companyVo.setSigningStatus(0);
+            companyVo.setCreateTime(DateHelper.getNow());
+            companyVo.setProductOrInterface(0);
+            companyVo.setExamineStatus(0);
+            companyDao.create(companyVo);
+            // 保存公司扩展信息表
+            CompanyExtendVo companyExtendVo = new CompanyExtendVo();
+            companyExtendVo.setId(companyId);
+            companyExtendDao.create(companyExtendVo);
+
+            String roleId = StringHelper.getNewID();
+            // 保存角色表
+            RoleVo roleVo = new RoleVo();
+            roleVo.setId(roleId);
+            roleVo.setCompanyId(companyId);
+            roleVo.setName(saveUserReqVo.getAccount() + "Admin");
+            roleVo.setRemark(saveUserReqVo.getAccount() + "Admin");
+            roleDao.create(roleVo);
+            // 保存角色用户表
+            UserRoleVo userRoleVo = new UserRoleVo();
+            userRoleVo.setId(StringHelper.getNewID());
+            userRoleVo.setUserId(userId);
+            userRoleVo.setRoleId(roleId);
+            userRoleDao.create(userRoleVo);
+            // 保存角色权限表 先查询默认权限，跟角色添加默认权限
+            AuthorityReqVo authorityReqVo = new AuthorityReqVo();
+            authorityReqVo.setAttribute(PangdConstant.ATTRIBUTE_SCENIC);
+            authorityReqVo.setAuthorityLevel(AuthorityConstant.AUTHORITY_LEVEL_DEFAULT);
+            List<AuthorityResVo> authorityResVoList = authorityDao.loadList(authorityReqVo, AuthorityResVo.class);
+            for (int i = 0; i < authorityResVoList.size(); i++) {
+                AuthorityResVo authorityResVo = authorityResVoList.get(i);
+                RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
+                roleAuthorityVo.setId(StringHelper.getNewID());
+                roleAuthorityVo.setAuthorityId(authorityResVo.getId());
+                roleAuthorityVo.setRoleId(roleId);
+                roleAuthorityDao.create(roleAuthorityVo);
+            }
+            return ResponseResult.result("注册成功");
+        } catch (Exception e) {
+            return ResponseResult.error("99", e.getMessage());
+        }
+    }
+
+
+    @Override
+    public UserResVo queryUser(UserReqVo req) {
+        return userDao.queryUser(req);
+    }
+
+    /**************************************/
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -167,7 +408,7 @@ public class UserServiceImpl implements UserService {
     @Override
     public String updateUserInfo(UserReqVo req) {
         UserVo userVo = userDao.load(req.getId(), UserVo.class);
-        if(!StringHelper.isEmpty(userVo)){
+        if (!StringHelper.isEmpty(userVo)) {
             userVo.setReceiveFlag(req.getReceiveFlag());
             userDao.update(userVo);
         }
@@ -228,9 +469,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public WebUserResVo getUserById(String userId) {
-        UserGetReqVo reqVo = new UserGetReqVo();
-        reqVo.setId(userId);
-        UserVo userVo = userDao.getUser(reqVo);
+        UserVo userVo = userDao.load(userId, UserVo.class);
         if (userVo == null) {
             throw new CodeException("该用户不存在");
         }
@@ -346,116 +585,5 @@ public class UserServiceImpl implements UserService {
      * @param saveUserReqVo
      */
 
-    @Override
-    @Transactional(rollbackFor = RuntimeException.class)
-    public ResponseResult<String> registerSaveUser(SaveUserReqVo saveUserReqVo) {
-        // 用户名是否存在
-        UserReqVo userReqVo = new UserReqVo();
-        userReqVo.setAccount(saveUserReqVo.getAccount());
-        UserVo userVo = userDao.load(userReqVo, UserVo.class);
-        if (!StringHelper.isEmpty(userVo)) {
-            // 用户名已存在
-            return ResponseResult.error("99", "该用户名已存在");
-        }
-        try {
-         /*将RSA加密后的密码解密*/
-            String password = saveUserReqVo.getPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
-            String confirmPassword = saveUserReqVo.getConfirmPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
-            if (!StringHelper.compare(password, confirmPassword)) {
-                return ResponseResult.error("99", "两次填写的密码不相等");
-            }
-
-            // 验证邀请码是否正确
-            CompanyResVo companyResVo = companyService.findCompany(saveUserReqVo.getInvitationCode());
-            if (StringHelper.isEmpty(companyResVo)) {
-                // 邀请码不正确
-                return ResponseResult.error("99", "注册编码错误");
-            }
-            // 判断邀请公司状态
-            if(0 == companyResVo.getInvitationStatus() || 1 != companyResVo.getExamineStatus()){
-                return ResponseResult.error("99", "用户邀请状态错误：" + companyResVo.getInvitationStatus() + ",状态错误：" + companyResVo.getExamineStatus());
-            }
-
-            // 判断该账户已经邀请的人数
-            if(companyResVo.getInviteesPeople() <= companyResVo.getInvitedPeople()){
-                throw new CodeException("邀请人数已超过可邀请人数，注册失败。可邀请人数为：" + companyResVo.getInviteesPeople());
-            }
-            // 添加用户邀请人数
-            UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
-            updateCompanyMoneyReqVo.setCompanyId(companyResVo.getId());
-            updateCompanyMoneyReqVo.setInvitedPeople(1);
-            companyExtendDao.updateCompanyInvitedPeople(updateCompanyMoneyReqVo);
-
-            String companyId = StringHelper.getNewID();
-            String userId = StringHelper.getNewID();
-
-            // 保存用户表
-            userVo = new UserVo();
-            userVo.setId(userId);
-            userVo.setAccount(saveUserReqVo.getAccount());
-            userVo.setPassword(this.passwordEncoder(password));
-            userVo.setRemark(password);
-            userVo.setCompanyId(companyId);
-            userVo.setCreateTime(DateHelper.getNow());
-            userVo.setCreateId(userId);
-            userVo.setCreateName(saveUserReqVo.getAccount());
-            userVo.setStatus(0);
-            userDao.create(userVo);
-
-            // 保存公司表
-            CompanyVo companyVo = new CompanyVo();
-            companyVo.setId(companyId);
-            companyVo.setInvitationCompanyId(companyResVo.getId());
-            companyVo.setInvitationCompanyName(companyResVo.getCompanyName());
-            companyVo.setStatus(CompanyConstant.COMPANY_STATUS_INIT);
-            companyVo.setNature(saveUserReqVo.getCompanyType());
-            if(3 == companyVo.getNature()){
-                companyVo.setCompanyType(0);
-            }else{
-                companyVo.setCompanyType(1);
-            }
-            companyVo.setSigningStatus(0);
-            companyVo.setCreateTime(DateHelper.getNow());
-            companyVo.setProductOrInterface(0);
-            companyVo.setExamineStatus(0);
-            companyDao.create(companyVo);
-            // 保存公司扩展信息表
-            CompanyExtendVo companyExtendVo = new CompanyExtendVo();
-            companyExtendVo.setId(companyId);
-            companyExtendDao.create(companyExtendVo);
-
-            String roleId = StringHelper.getNewID();
-            // 保存角色表
-            RoleVo roleVo = new RoleVo();
-            roleVo.setId(roleId);
-            roleVo.setCompanyId(companyId);
-            roleVo.setName(saveUserReqVo.getAccount() + "Admin");
-            roleVo.setRemark(saveUserReqVo.getAccount() + "Admin");
-            roleDao.create(roleVo);
-            // 保存角色用户表
-            UserRoleVo userRoleVo = new UserRoleVo();
-            userRoleVo.setId(StringHelper.getNewID());
-            userRoleVo.setUserId(userId);
-            userRoleVo.setRoleId(roleId);
-            userRoleDao.create(userRoleVo);
-            // 保存角色权限表 先查询默认权限，跟角色添加默认权限
-            AuthorityReqVo authorityReqVo = new AuthorityReqVo();
-            authorityReqVo.setAttribute(PangdConstant.ATTRIBUTE_SCENIC);
-            authorityReqVo.setAuthorityLevel(AuthorityConstant.AUTHORITY_LEVEL_DEFAULT);
-            List<AuthorityResVo> authorityResVoList = authorityDao.loadList(authorityReqVo, AuthorityResVo.class);
-            for (int i = 0; i < authorityResVoList.size(); i++) {
-                AuthorityResVo authorityResVo = authorityResVoList.get(i);
-                RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
-                roleAuthorityVo.setId(StringHelper.getNewID());
-                roleAuthorityVo.setAuthorityId(authorityResVo.getId());
-                roleAuthorityVo.setRoleId(roleId);
-                roleAuthorityDao.create(roleAuthorityVo);
-            }
-            return ResponseResult.result("注册成功");
-        } catch (Exception e) {
-            return ResponseResult.error("99", e.getMessage());
-        }
-    }
-
 
 }

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

 package com.pangding.web.authority.util;
 
-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.company.CompanyBankCardDao;
+import com.pangding.web.authority.dao.company.CompanyDao;
+import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.service.FinanceService;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
@@ -15,7 +15,6 @@ import com.yanzuoguang.util.helper.StringHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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 com.pangding.web.vo.product.pd.merchant.MerchantVo;
-import com.pangding.web.vo.system.pd.authority.UserVo;
-
-import java.util.List;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/16 17:50
- */
-public class LoginResVo {
-    private String token;
-
-    private UserVo userVo;
-
-    private String code;
-
-    private String msg;
-
-    /**
-     * 电子签约地址
-     */
-    private String url;
-
-    private LoginCompanyResVo companyResVo;
-
-    private List<AuthorityListByLevelResVo> authorityListByLevel;
-
-    private MerchantVo merchant;
-
-    public MerchantVo getMerchant() {
-        return merchant;
-    }
-
-    public void setMerchant(MerchantVo merchant) {
-        this.merchant = merchant;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public List<AuthorityListByLevelResVo> getAuthorityListByLevel() {
-        return authorityListByLevel;
-    }
-
-    public void setAuthorityListByLevel(List<AuthorityListByLevelResVo> authorityListByLevel) {
-        this.authorityListByLevel = authorityListByLevel;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public UserVo getUserVo() {
-        return userVo;
-    }
-
-    public void setUserVo(UserVo userVo) {
-        this.userVo = userVo;
-    }
-
-    public LoginCompanyResVo getCompanyResVo() {
-        return companyResVo;
-    }
-
-    public void setCompanyResVo(LoginCompanyResVo companyResVo) {
-        this.companyResVo = companyResVo;
-    }
-}

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

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

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

-package com.pangding.web.authority.vo.reqvo;
-
-import com.yanzuoguang.util.vo.PageSizeReqVo;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/23 14:28
- */
-public class ListCompanyReqVo extends PageSizeReqVo {
-    private String reqId;
-
-    @ApiModelProperty(notes = "公司名称")
-    private String companyName;
-    @ApiModelProperty(notes = "公司类型")
-    private String companyType;
-    @ApiModelProperty(notes = "公司属性: 0:其他;1:景区；2:酒店；3:餐饮；4:特产；5:运营车,6.团队）")
-    private Integer companyAttribute;
-    @ApiModelProperty(notes = "审核状态")
-    private String examineStatus;
-    @ApiModelProperty(notes = "公司编号")
-    private String companyId;
-
-    @ApiModelProperty(notes = "联系人")
-    private String contactName;
-    @ApiModelProperty(notes = "联系人电话")
-    private String contactPhone;
-    @ApiModelProperty(notes = "公司状态")
-    private Integer status;
-    @ApiModelProperty(notes = "开始时间")
-    private String startDate;
-    @ApiModelProperty(notes = "结束时间")
-    private String endDate;
-
-    public String getReqId() {
-        return reqId;
-    }
-
-    public void setReqId(String reqId) {
-        this.reqId = reqId;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyType() {
-        return companyType;
-    }
-
-    public void setCompanyType(String companyType) {
-        this.companyType = companyType;
-    }
-
-    public Integer getCompanyAttribute() {
-        return companyAttribute;
-    }
-
-    public void setCompanyAttribute(Integer companyAttribute) {
-        this.companyAttribute = companyAttribute;
-    }
-
-    public String getExamineStatus() {
-        return examineStatus;
-    }
-
-    public void setExamineStatus(String examineStatus) {
-        this.examineStatus = examineStatus;
-    }
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    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 Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(String startDate) {
-        this.startDate = startDate;
-    }
-
-    public String getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(String endDate) {
-        this.endDate = endDate;
-    }
-}

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

 package com.pangding.web.authority.vo.reqvo;
 
-import org.springframework.context.annotation.Bean;
 
 /**
  * @Author zhangjinyao

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

-package com.pangding.web.authority.vo.resvo;
-
-import com.pangding.web.vo.system.pd.authority.AuthorityVo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/30 18:10
- */
-public class AuthorityListByLevelResVo extends AuthorityVo {
-
-    private String authorityId;
-
-    List<AuthorityListByLevelResVo> childList = new ArrayList<>();
-
-    public List<AuthorityListByLevelResVo> getChildList() {
-        return childList;
-    }
-
-    public void setChildList(List<AuthorityListByLevelResVo> childList) {
-        this.childList = childList;
-    }
-
-    public String getAuthorityId() {
-        return authorityId;
-    }
-
-    public void setAuthorityId(String authorityId) {
-        this.authorityId = authorityId;
-    }
-}

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

 package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.vo.system.pd.authority.AuthorityVo;
+import com.pangding.web.vo.system.res.authority.AuthorityListByLevelResVo;
 
 import java.util.List;
 

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

-package com.pangding.web.authority.vo.resvo;
-
-import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
-import com.pangding.web.vo.system.pd.company.CompanyVo;
-import com.pangding.web.vo.system.res.company.CompanyResVo;
-
-import java.util.List;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/21 17:01
- */
-public class LoginCompanyResVo {
-    private CompanyResVo companyVo;
-
-    private CompanyBankCardVo companyBankCardVo;
-
-    private List<CompanyBankCardVo> bankCardVoList;
-
-    public CompanyResVo getCompanyVo() {
-        return companyVo;
-    }
-
-    public void setCompanyVo(CompanyResVo companyVo) {
-        this.companyVo = companyVo;
-    }
-
-    public CompanyBankCardVo getCompanyBankCardVo() {
-        return companyBankCardVo;
-    }
-
-    public void setCompanyBankCardVo(CompanyBankCardVo companyBankCardVo) {
-        this.companyBankCardVo = companyBankCardVo;
-    }
-
-    public List<CompanyBankCardVo> getBankCardVoList() {
-        return bankCardVoList;
-    }
-
-    public void setBankCardVoList(List<CompanyBankCardVo> bankCardVoList) {
-        this.bankCardVoList = bankCardVoList;
-    }
-}