新增设备，修改注册流程

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.service.AgreementService;
+import com.pangding.web.vo.system.req.AgreementTemplateReqVo;
+import com.pangding.web.vo.system.res.AgreementTemplateResVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * @author tangfang
+ * @date 2020-08-31 19:03:23
+ * 合同模板
+ */
+@RestController
+@RequestMapping(value = "/agreement", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "合同模板类", description = "合同模板的查询，新增，修改，删除等相关操作")
+public class AgreementController {
+
+    @Autowired
+    private AgreementService agreementService;
+
+    @RequestMapping(value = "/getListAgreement")
+    @ApiOperation(value = "获取合同模板列表", notes = "返回合同模板列表")
+    public ResponseResult getListAgreement(@RequestBody AgreementTemplateReqVo req) {
+
+        return ResponseResult.result(agreementService.findAgreemnetList(req));
+    }
+
+    @RequestMapping(value = "/findAgreement")
+    @ApiOperation(value = "获取合同详情", notes = "返回合同详情")
+    public ResponseResult<AgreementTemplateResVo> findAgreement(@RequestBody AgreementTemplateReqVo req) {
+        return ResponseResult.result(agreementService.findAgreementDetail(req));
+    }
+
+    @RequestMapping(value = "/saveAgreementTemplate")
+    @ApiOperation(value = "保存合同模板", notes = "返回保存合同结果")
+    public ResponseResult saveAgreementTemplate(@RequestBody AgreementTemplateReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("agreementName", req.getAgreementName())
+                .notBlankCheck("agreementType", req.getAgreementType())
+                .notBlankCheck("companyAttribute", req.getCompanyAttribute())
+                .notBlankCheck("agreementContent", req.getAgreementContent())
+                .notBlankCheck("agreementFileUrl", req.getAgreementFileUrl())
+                .checkException();
+        return ResponseResult.result(agreementService.saveAgreement(req));
+    }
+
+    @RequestMapping(value = "/removeAgreement")
+    @ApiOperation(value = "删除合同模板", notes = "返回删除结果")
+    public ResponseResult removeAgreement(@RequestBody AgreementTemplateReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("agreementId", req.getAgreementId())
+                .checkException();
+        agreementService.removeAgreement(req);
+        return ResponseResult.result("");
+    }
+
+}

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.service.CompanyCodeService;
+import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
+import com.pangding.web.vo.system.res.company.CompanyCodeResVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+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;
+
+@RestController
+@RequestMapping(value = "/companyCode", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "商户二维码相关类", description = "商户二维码新增，修改，删除等相关操作")
+public class CompanyCodeController {
+
+    @Autowired
+    private CompanyCodeService companyCodeService;
+
+    @RequestMapping(value = "/findCodeLink")
+    @ApiOperation(value = "查询商户跳转链接地址", notes = "返回商户需要跳转的连接地址.")
+    public ResponseResult<CompanyCodeResVo> findCodeLink(@RequestBody CompanyCodeReqVo req) {
+        CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
+                .notBlankCheck("codeType", req.getCodeType())
+                .checkException();
+        return ResponseResult.result(companyCodeService.findCodeLink(req));
+    }
+
+    @RequestMapping(value = "/findCodeList")
+    @ApiOperation(value = "查询商户二维码列表", notes = "返回商户二维码列表")
+    public ResponseResult findCodeList(@RequestBody CompanyCodeReqVo req) {
+        return null;
+    }
+
+
+}

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

 package com.pangding.web.authority.controller;
 
 
+import com.pangding.web.authority.service.CompanyAgreementService;
 import com.pangding.web.authority.service.CompanyService;
+import com.pangding.web.vo.system.req.company.CompanyAgreementReqVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
@@ -15,30 +17,52 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/newCompany")
+@RequestMapping(value = "/newCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public class CompanyController {
 
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private CompanyAgreementService companyAgreementService;
 
     /**
      * 找到公司余额
+     *
      * @param req
      * @return
      */
     @RequestMapping(value = "/findCompanyBalance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult findCompanyBalance(@RequestBody CompanyReqVo req){
-        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+    public ResponseResult findCompanyBalance(@RequestBody CompanyReqVo req) {
+        CheckerHelper.newInstance().notBlankCheck("id", req.getId()).checkException();
         return ResponseResult.result(companyService.findCompanyBalance(req));
     }
 
-    @ApiOperation(value ="公司，个人实名制", notes = "返回实名制结果")
     @RequestMapping(value = "/updateCompanyInfo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<SaveCompanyReqVo> updateCompanyInfo(@RequestBody SaveCompanyReqVo req){
-        CheckerHelper.newInstance().notBlankCheck("id",req.getCompanyVo().getId()).checkException();
+    @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) {
+        CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
+                .notBlankCheck("agreementCode", req.getAgreementCode())
+                .checkException();
+        return ResponseResult.result(companyAgreementService.checkAgreement(req));
+    }
+
+    @RequestMapping(value = "saveComapnyAgreement")
+    @ApiOperation(value = "公司签署合同", notes = "返回签署结果")
+    public ResponseResult saveCompanyAgreement(@RequestBody CompanyAgreementReqVo req){
+        CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
+                .notBlankCheck("agreementId", req.getAgreementId())
+                .notBlankCheck("agreementCode", req.getAgreementCode())
+                .checkException();
+        return ResponseResult.result(companyAgreementService.saveCompanyAgreement(req));
+
+    }
 
 
 }

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

@@ -10,6 +10,8 @@ import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -118,9 +120,10 @@ public class CompanyManagementController {
      * @return 银行卡表主键
      */
     @RequestMapping(value = "/saveBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
+    @ApiOperation(value = "保存银行卡(发送验证码接口)", notes = "返回保存结果")
+    public ResponseResult<CompanyBankCardVo> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
         checkBank(reqVo);
-        return ResponseResult.result(companyServiceImpl.saveBank(reqVo));
+        return companyServiceImpl.saveBank(reqVo);
     }
 
     private void checkBank(CompanyBankCardReqVo reqVo){
@@ -143,9 +146,10 @@ public class CompanyManagementController {
      * @return 目前返回验证码
      */
     @RequestMapping(value = "/bankSubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "获取验证码，提交接口", notes = "返回保存结果")
     public ResponseResult<CompanyBankCardVo> bankSubmit(@RequestBody BankSubmitReqVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("bankCardId",reqVo.getId())
+                .notBlankCheck("id",reqVo.getId())
                 .notBlankCheck("verifyCode",reqVo.getVerifyCode())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.bankSubmit(reqVo));
@@ -157,11 +161,12 @@ public class CompanyManagementController {
      * @return 银行卡列表分页对象
      */
     @RequestMapping(value = "/bankCardList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "获取银行卡列表", notes = "返回银行卡列表")
     public ResponseResult bankCardList(@RequestBody BankCardListReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.getBankCardList(reqVo));
+        return ResponseResult.resultAllowNull(companyServiceImpl.getBankCardList(reqVo));
     }
 
     /**y
@@ -190,9 +195,10 @@ public class CompanyManagementController {
      * @return
      */
     @RequestMapping(value = "/deleteBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "删除银行卡", notes = "返回删除结果")
     public ResponseResult deleteBank(@RequestBody CompanyBankCardVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("companyBankCardId",reqVo.getId())
+                .notBlankCheck("id",reqVo.getId())
                 .checkException();
         companyServiceImpl.deleteBank(reqVo);
         return new ResponseResult();
@@ -204,9 +210,10 @@ public class CompanyManagementController {
      * @return
      */
     @RequestMapping(value = "/setDefault", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "设置默认银行卡", notes = "返回设置结果")
     public ResponseResult setDefault(@RequestBody CompanyBankCardVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("bankCardId",reqVo.getId())
+                .notBlankCheck("id",reqVo.getId())
                 .checkException();
         companyServiceImpl.setDefault(reqVo);
         return new ResponseResult();

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

@@ -5,6 +5,8 @@ import com.pangding.web.authority.vo.reqvo.WithdrawalReqVo;
 import com.pangding.web.authority.vo.resvo.WithdrawalResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -16,11 +18,13 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping(value = "/finance",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "余额", description = "余额")
 public class FinanceController {
     @Autowired
     private FinanceService financeServiceImpl;
 
     @PostMapping(value = "/withdrawal")
+    @ApiOperation(value = "公司余额查询", notes = "返回公司余额信息")
     public ResponseResult<WithdrawalResVo> withdrawal(@RequestBody WithdrawalReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())

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

@@ -143,9 +143,9 @@ public class PangdingManagementController {
      * @return 银行卡表主键
      */
     @RequestMapping(value = "/saveBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
+    public ResponseResult<CompanyBankCardVo> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
         checkBank(reqVo);
-        return ResponseResult.result(companyServiceImpl.saveBank(reqVo));
+        return companyServiceImpl.saveBank(reqVo);
     }
 
     private void checkBank(CompanyBankCardReqVo reqVo){

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

@@ -72,9 +72,9 @@ public class PangdingPartnerController {
      * @return 银行卡表主键
      */
     @PostMapping(value = "/saveBank",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
+    public ResponseResult<CompanyBankCardVo> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
         checkBank(reqVo);
-        return ResponseResult.result(pangdingPartnerServiceImpl.saveBank(reqVo));
+        return pangdingPartnerServiceImpl.saveBank(reqVo);
     }
 
     private void checkBank(CompanyBankCardReqVo reqVo){

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

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

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

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

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

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

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

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

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

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

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

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

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

 package com.pangding.web.authority.feign;
 
-import com.pangding.web.authority.vo.reqvo.CompanyBankReqVo;
+import com.pangding.web.authority.vo.reqvo.CompanyBankReqVo1;
 import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
@@ -36,7 +36,7 @@ public interface PayFeign {
      * @return
      */
     @RequestMapping(value="/bindback")
-    public ResponseResult<CompanyBankReqVo> bindBack(@RequestBody CompanyBankReqVo req);
+    ResponseResult<CompanyBankCardReqVo> bindBack(@RequestBody CompanyBankCardReqVo req);
 
     /**
      * 解绑银行卡
@@ -44,7 +44,7 @@ public interface PayFeign {
      * @return
      */
     @RequestMapping(value = "/unbindBankCard")
-    public ResponseResult<CompanyBankReqVo> unbindBankCard(@RequestBody CompanyBankReqVo req);
+    ResponseResult<CompanyBankCardReqVo> unbindBankCard(@RequestBody CompanyBankCardReqVo req);
 
     /**
      * 获取签约地址

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

+package com.pangding.web.authority.service;
+
+import com.pangding.web.vo.system.pd.AgreementTemplateVo;
+import com.pangding.web.vo.system.req.AgreementTemplateReqVo;
+import com.pangding.web.vo.system.res.AgreementTemplateResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+public interface AgreementService {
+
+
+    /**
+     * 找到合同详情
+     * @param req
+     * @return
+     */
+    AgreementTemplateResVo findAgreementDetail(AgreementTemplateReqVo req);
+
+    /**
+     * 查询合同模板列表
+     * @param req
+     * @return
+     */
+    PageSizeData<AgreementTemplateResVo> findAgreemnetList(AgreementTemplateReqVo req);
+
+    /**
+     * 保存合同模板
+     * @param req
+     * @return
+     */
+    AgreementTemplateVo saveAgreement(AgreementTemplateReqVo req);
+
+    /**
+     * 删除合同模板
+     * @param req
+     */
+    void removeAgreement(AgreementTemplateReqVo req);
+
+}

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

+package com.pangding.web.authority.service;
+
+import com.pangding.web.vo.system.pd.company.CompanyAgreementVo;
+import com.pangding.web.vo.system.req.company.CompanyAgreementReqVo;
+import com.pangding.web.vo.system.res.company.CompanyAgreementResVo;
+
+public interface CompanyAgreementService {
+
+    CompanyAgreementResVo checkAgreement(CompanyAgreementReqVo req);
+
+    CompanyAgreementVo saveCompanyAgreement(CompanyAgreementReqVo req);
+
+}

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

+package com.pangding.web.authority.service;
+
+import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
+import com.pangding.web.vo.system.res.company.CompanyCodeResVo;
+
+public interface CompanyCodeService {
+
+    /**
+     * 查询商户二维码跳转链接地址
+     * @param req
+     * @return
+     */
+    CompanyCodeResVo findCodeLink(CompanyCodeReqVo req);
+
+}

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

@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 import 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.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -85,7 +86,7 @@ public interface CompanyService{
      * @param reqVo 公司银行卡表信息
      * @return 银行卡表主键
      */
-    String saveBank(CompanyBankCardVo reqVo);
+    ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo);
 
     /**
      * 删除银行卡

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

@@ -3,6 +3,8 @@ package com.pangding.web.authority.service;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.yanzuoguang.util.vo.ResponseResult;
 
 import java.util.List;
 
@@ -37,7 +39,7 @@ public interface PangdingPartnerService {
      * @param reqVo 公司银行卡表信息
      * @return 银行卡表主键
      */
-    String saveBank(CompanyBankCardVo reqVo);
+    ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo);
 
     /**
      * 提交银行卡信息，验证手机验证码，并更新银行卡状态

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

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.AgreementTemplateDao;
+import com.pangding.web.authority.service.AgreementService;
+import com.pangding.web.vo.system.pd.AgreementTemplateVo;
+import com.pangding.web.vo.system.req.AgreementTemplateReqVo;
+import com.pangding.web.vo.system.res.AgreementTemplateResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.DateHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AgreementServiceImpl implements AgreementService {
+
+    @Autowired
+    private AgreementTemplateDao agreementTemplateDao;
+
+    @Override
+    public AgreementTemplateResVo findAgreementDetail(AgreementTemplateReqVo req) {
+        AgreementTemplateResVo agreementTemplateResVo = agreementTemplateDao.load(req, AgreementTemplateResVo.class);
+        return agreementTemplateResVo;
+    }
+
+    @Override
+    public PageSizeData<AgreementTemplateResVo> findAgreemnetList(AgreementTemplateReqVo req) {
+        PageSizeData<AgreementTemplateResVo> agreementTemplateResVoPageSizeData = agreementTemplateDao.loadPage(req, AgreementTemplateResVo.class);
+        return agreementTemplateResVoPageSizeData;
+    }
+
+    @Override
+    public AgreementTemplateVo saveAgreement(AgreementTemplateReqVo req){
+        AgreementTemplateVo agreementTemplateVo = new AgreementTemplateVo();
+        if(StringHelper.isEmpty(req.getAgreementId())){
+            // 保存
+            ObjectHelper.writeWithFrom(agreementTemplateVo, req);
+            agreementTemplateVo.setCreateTime(DateHelper.getNow());
+            agreementTemplateDao.create(agreementTemplateVo);
+        }else{
+            // 修改
+             agreementTemplateVo = agreementTemplateDao.load(req.getAgreementId(), AgreementTemplateVo.class);
+            if(!StringHelper.isEmpty(agreementTemplateVo)){
+                ObjectHelper.writeWithFrom(agreementTemplateVo, req);
+                agreementTemplateDao.update(agreementTemplateVo);
+            }
+        }
+        return agreementTemplateVo;
+    }
+
+    public void removeAgreement(AgreementTemplateReqVo req){
+        agreementTemplateDao.remove(req.getAgreementId());
+    }
+
+}

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

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.CompanyAgreementDao;
+import com.pangding.web.authority.service.CompanyAgreementService;
+import com.pangding.web.vo.system.pd.company.CompanyAgreementVo;
+import com.pangding.web.vo.system.req.company.CompanyAgreementReqVo;
+import com.pangding.web.vo.system.res.company.CompanyAgreementResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.exception.CodeException;
+import com.yanzuoguang.util.helper.StringHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CompanyAgreementServiceImpl implements CompanyAgreementService {
+
+    @Autowired
+    private CompanyAgreementDao companyAgreementDao;
+
+    @Override
+    public CompanyAgreementResVo checkAgreement(CompanyAgreementReqVo req) {
+        CompanyAgreementResVo companyAgreementResVo = companyAgreementDao.load(req, CompanyAgreementResVo.class);
+        return companyAgreementResVo;
+    }
+
+    @Override
+    public CompanyAgreementVo saveCompanyAgreement(CompanyAgreementReqVo req) {
+        String id = StringHelper.getMD5Id(req.getCompanyId(), req.getAgreementCode());
+        CompanyAgreementVo companyAgreementVo = companyAgreementDao.load(id, CompanyAgreementVo.class);
+        if (!StringHelper.isEmpty(companyAgreementVo)) {
+            throw new CodeException("已签署合同");
+        }
+        companyAgreementVo = new CompanyAgreementVo();
+        ObjectHelper.writeWithFrom(companyAgreementVo, req);
+        companyAgreementVo.setCompanyAgreementId(id);
+        companyAgreementDao.create(companyAgreementVo);
+        return companyAgreementVo;
+    }
+
+}

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

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.CompanyCodeDao;
+import com.pangding.web.authority.service.CompanyCodeService;
+import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
+import com.pangding.web.vo.system.res.company.CompanyCodeResVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CompanyCodeServiceImpl implements CompanyCodeService {
+
+    @Autowired
+    private CompanyCodeDao companyCodeDao;
+
+    @Override
+    public CompanyCodeResVo findCodeLink(CompanyCodeReqVo req){
+        CompanyCodeResVo companyCodeResVo = companyCodeDao.load(req, CompanyCodeResVo.class);
+        return companyCodeResVo;
+    }
+
+
+}

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

@@ -14,7 +14,6 @@ import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.constant.OrderConstant;
-import com.pangding.web.constant.PangdConstant;
 import com.pangding.web.mq.CompanyProducer;
 import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
@@ -26,7 +25,6 @@ import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
 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.company.CompanyBankCardReqVo;
-import com.pangding.web.vo.system.req.company.CompanyExtendReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
 import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
@@ -219,7 +217,7 @@ public class CompanyServiceImpl implements CompanyService {
 
         /*注册服务请求对象*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
-        companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
+        companyReqVo.setBankList(new ArrayList<CompanyBankReqVo1>());
         ObjectHelper.writeWithFrom(companyReqVo, companyVo);
         companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
 
@@ -235,9 +233,9 @@ public class CompanyServiceImpl implements CompanyService {
             companyBankCardVo.setIdCard(reqVo.getContactCode());
             companyBankCardVo.setCompanyId(companyVo.getId());
 
-            CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-            ObjectHelper.writeWithFrom(companyBankReqVo, companyBankCardVo);
-            companyReqVo.getBankList().add(companyBankReqVo);
+            CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
+            ObjectHelper.writeWithFrom(companyBankReqVo1, companyBankCardVo);
+            companyReqVo.getBankList().add(companyBankReqVo1);
         }
         /*注册*/
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
@@ -262,11 +260,11 @@ public class CompanyServiceImpl implements CompanyService {
         resVo.setStatus(companyVo1.getStatus());
 
         /*保存银行卡表*/
-        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
-        if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()) {
+        List<CompanyBankReqVo1> companyBankReqVo1List = res.getBankList();
+        if (null != companyBankReqVo1List && !companyBankReqVo1List.isEmpty()) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
-            CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
-            ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
+            CompanyBankReqVo1 companyBankReqVo1 = companyBankReqVo1List.get(0);
+            ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo1);
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
 
             if (!StringHelper.isEmpty(reqVo.getCompanyBankCardId())) {
@@ -370,7 +368,7 @@ public class CompanyServiceImpl implements CompanyService {
         resVo.setCompanyExtendId(companyVo.getId());
         /*注册请求对象*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
-        companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
+        companyReqVo.setBankList(new ArrayList<CompanyBankReqVo1>());
         ObjectHelper.writeWithFrom(companyReqVo, companyVo);
         if (null != reqVo.getVerifyCode() && !reqVo.getVerifyCode().isEmpty()) {
             companyReqVo.setValidateCode(reqVo.getVerifyCode());
@@ -387,9 +385,9 @@ public class CompanyServiceImpl implements CompanyService {
             companyBankCardVo.setBankAddress(reqVo.getBankAddress());
             companyBankCardVo.setBankCardCode(reqVo.getBankCardCode());
             companyBankCardVo.setBankCode(reqVo.getBankCode());
-            CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-            ObjectHelper.writeWithFrom(companyBankReqVo, companyBankCardVo);
-            companyReqVo.getBankList().add(companyBankReqVo);
+            CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
+            ObjectHelper.writeWithFrom(companyBankReqVo1, companyBankCardVo);
+            companyReqVo.getBankList().add(companyBankReqVo1);
 
             resVo.setCompanyBankCardId(companyBankCardVo.getId());
         }
@@ -410,11 +408,11 @@ public class CompanyServiceImpl implements CompanyService {
         companyDao.update(companyVo1);
 
         /*更新银行卡表*/
-        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
-        if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()) {
+        List<CompanyBankReqVo1> companyBankReqVo1List = res.getBankList();
+        if (null != companyBankReqVo1List && !companyBankReqVo1List.isEmpty()) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
-            CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
-            ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
+            CompanyBankReqVo1 companyBankReqVo1 = companyBankReqVo1List.get(0);
+            ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo1);
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
             companyBankCardDao.update(companyBankCardVo);
         }
@@ -484,45 +482,48 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String saveBank(CompanyBankCardVo reqVo) {
-        String id = StringHelper.getNewID();
-
+    public ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo) {
+        CompanyVo companyVo = companyDao.load(reqVo.getCompanyId(), CompanyVo.class);
+        if(StringHelper.isEmpty(companyVo)){
+            throw new CodeException("用户信息没有找到。");
+        }
         // 判断银行卡是否存在
-        CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
-        checkReqVo.setCompanyId(reqVo.getCompanyId());
-        checkReqVo.setBankCardCode(reqVo.getBankCardCode());
-        CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(checkReqVo, CompanyBankCardVo.class);
+        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("银行卡已绑定，不可修改。");
             }
-            ObjectHelper.writeWithToClass(companyBankCardVo, reqVo);
             /*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
-            CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-            ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
-            ResponseResult result = payFeign.bindBack(companyBankReqVo);
+            ObjectHelper.writeWithFrom(reqVo, companyBankCardVo);
+            reqVo.setReservedPhone(reqVo.getPhone());
+            ResponseResult<CompanyBankCardReqVo> result = payFeign.bindBack(reqVo);
             if (null == result || !"00".equals(result.getCode())) {
                 throw new CodeException("绑定银行卡失败，请重试");
             }
-            CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
+            CompanyBankCardReqVo resVo = result.getData();
             ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
-            companyBankCardVo.setIsDefault(reqVo.getIsDefault());
+            companyBankCardVo.setIsDefault(0);
             companyBankCardDao.update(companyBankCardVo);
+            if(1 == companyBankCardVo.getStatus()){
+                return ResponseResult.error("99", "该银行卡已绑定");
+            }
         } else {
-            com.pangding.web.vo.system.pd.company.CompanyBankCardVo saveCompanyBankVo = new com.pangding.web.vo.system.pd.company.CompanyBankCardVo();
-            ObjectHelper.writeWithToClass(saveCompanyBankVo, reqVo);
+            companyBankCardVo = new CompanyBankCardVo();
+//            companyBankCardVo.setId(bankId);
             /*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
-            CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-            ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
-            companyBankReqVo.setId(id);
-            ResponseResult result = payFeign.bindBack(companyBankReqVo);
+            reqVo.setId(bankId);
+            reqVo.setReservedPhone(reqVo.getPhone());
+            reqVo.setStatus(0);
+            ResponseResult<CompanyBankCardReqVo> result = payFeign.bindBack(reqVo);
             if (null == result || !"00".equals(result.getCode())) {
                 throw new CodeException("绑定银行卡失败，请重试");
             }
-            CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
+            CompanyBankCardReqVo resVo = result.getData();
             ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
-            companyBankCardVo.setIsDefault(reqVo.getIsDefault());
+//            companyBankCardVo.setIsDefault(reqVo.getIsDefault());
             BankCardListReqVo reqVo1 = new BankCardListReqVo();
             reqVo1.setCompanyId(reqVo.getCompanyId());
             PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
@@ -534,8 +535,11 @@ public class CompanyServiceImpl implements CompanyService {
             }
             reqVo.setStatus(0);
             companyBankCardDao.create(companyBankCardVo);
+            if(1 == companyBankCardVo.getStatus()){
+                return ResponseResult.error("99", "该银行卡已绑定");
             }
-        return reqVo.getId();
+        }
+        return ResponseResult.result(companyBankCardVo);
     }
 
     /**
@@ -547,10 +551,10 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteBank(CompanyBankCardVo reqVo) {
-        CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo, CompanyBankCardVo.class);
-        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-        ObjectHelper.writeWithFrom(companyBankReqVo, bankCardVo);
-        ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
+        CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo.getId(), CompanyBankCardVo.class);
+        CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
+        ObjectHelper.writeWithFrom(companyBankCardReqVo, bankCardVo);
+        ResponseResult result = payFeign.unbindBankCard(companyBankCardReqVo);
         if (null == result || !"00".equals(result.getCode())) {
             throw new CodeException("解绑失败，请重试");
         }
@@ -603,20 +607,19 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
 
         /*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
-        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-        ObjectHelper.writeWithFrom(companyBankReqVo, companyBankCardVo);
-        companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
-        ResponseResult result = payFeign.bindBack(companyBankReqVo);
+        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("绑定银行卡失败，请重试");
         }
-        CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
-        CompanyBankCardVo companyBankCardVo1 = new CompanyBankCardVo();
-        ObjectHelper.writeWithFrom(companyBankCardVo1, resVo);
-        companyBankCardVo1.setIsDefault(companyBankCardVo.getIsDefault());
-        companyBankCardDao.update(companyBankCardVo1);
+        CompanyBankCardReqVo resVo =  result.getData();
+        ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
+        companyBankCardDao.update(companyBankCardVo);
 
-        return companyBankCardVo1;
+        return companyBankCardVo;
     }
 
     /**
@@ -707,9 +710,9 @@ public class CompanyServiceImpl implements CompanyService {
     public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
 
         PageSizeData<CompanyBankCardVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardList(reqVo);
-        if (companyBankCardVoPageSizeData == null || companyBankCardVoPageSizeData.getList().isEmpty()) {
-            throw new CodeException("暂无银行卡，请先添加");
-        }
+//        if (companyBankCardVoPageSizeData == null || companyBankCardVoPageSizeData.getList().isEmpty()) {
+//            throw new CodeException("暂无银行卡，请先添加");
+//        }
         return companyBankCardVoPageSizeData;
     }
 

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

@@ -13,9 +13,11 @@ import com.pangding.web.vo.system.pd.authority.UserVo;
 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.company.CompanyBankCardReqVo;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
 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;
@@ -109,7 +111,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
      * @return 银行卡表主键
      */
     @Override
-    public String saveBank(CompanyBankCardVo reqVo) {
+    public ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo) {
         return companyServiceImpl.saveBank(reqVo);
     }
 
@@ -232,9 +234,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
     public String invitation(InvitationReqVo reqVo) {
 
         /*邀请码*/
-        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-        companyExtendGetReqVo.setId(reqVo.getCompanyId());
-        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo,CompanyExtendVo.class);
+        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo.getCompanyId(),CompanyExtendVo.class);
         if (null == companyExtendVo){
             companyExtendVo.setId(reqVo.getCompanyId());
             companyExtendVo.setQrCode(DateHelper.getNow()

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

@@ -5,14 +5,12 @@ import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.service.*;
 import com.pangding.web.authority.util.*;
-import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.util.RSAUtils;
-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.AuthorityVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
@@ -253,10 +251,10 @@ public class RegisterServiceImpl implements RegisterService {
         companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
         companyReqVo.setStatus(company.getStatus());
         companyReqVo.setBankList(new ArrayList());
-        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-        ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
-        companyBankReqVo.setId(StringHelper.getNewID());
-        companyReqVo.getBankList().add(companyBankReqVo);
+        CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
+        ObjectHelper.writeWithFrom(companyBankReqVo1, reqVo);
+        companyBankReqVo1.setId(StringHelper.getNewID());
+        companyReqVo.getBankList().add(companyBankReqVo1);
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())) {
             throw new CodeException("保存商户失败，请重试");
@@ -271,7 +269,7 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
         companyDaoImpl.update(companyVo);
 
-        List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
+        List<CompanyBankReqVo1> bankList = resCompanyReqVo.getBankList();
         if (null == bankList || bankList.isEmpty()) {
             throw new CodeException("保存商户失败，请重试");
         }
@@ -565,21 +563,21 @@ public class RegisterServiceImpl implements RegisterService {
         ObjectHelper.writeWithFrom(companyReqVo, companyVo);
         companyReqVo.setValidateCode(reqVo.getVerifyCode());
         companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
-        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
-        ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
-        companyBankReqVo.setType(reqVo.getCompanyType());
-        companyBankReqVo.setCompanyId(reqVo.getId());
-        companyBankReqVo.setName(reqVo.getContactName());
-        companyBankReqVo.setIdCard(reqVo.getContactCode());
-        companyBankReqVo.setPhone(reqVo.getContactPhone());
+        CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
+        ObjectHelper.writeWithFrom(companyBankReqVo1, reqVo);
+        companyBankReqVo1.setType(reqVo.getCompanyType());
+        companyBankReqVo1.setCompanyId(reqVo.getId());
+        companyBankReqVo1.setName(reqVo.getContactName());
+        companyBankReqVo1.setIdCard(reqVo.getContactCode());
+        companyBankReqVo1.setPhone(reqVo.getContactPhone());
         CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
         companyBankCardGetReqVo.setBankCardCode(reqVo.getBankCardCode());
         CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
-        companyBankReqVo.setStatus(companyBankCardVo1.getStatus());
-        companyBankReqVo.setId(StringHelper.getNewID());
-        companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
+        companyBankReqVo1.setStatus(companyBankCardVo1.getStatus());
+        companyBankReqVo1.setId(StringHelper.getNewID());
+        companyBankReqVo1.setValidateCode(reqVo.getVerifyCode());
         companyReqVo.setBankList(new ArrayList<>());
-        companyReqVo.getBankList().add(companyBankReqVo);
+        companyReqVo.getBankList().add(companyBankReqVo1);
 
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())) {
@@ -595,7 +593,7 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
         companyDaoImpl.update(companyVo1);
 
-        List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
+        List<CompanyBankReqVo1> bankList = resCompanyReqVo.getBankList();
         if (null == bankList || bankList.isEmpty()) {
             throw new CodeException("保存商户失败，请重试");
         }

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

@@ -4,7 +4,7 @@ package com.pangding.web.authority.vo.reqvo;
  * @Author zhangjinyao
  * @create 2019/6/2 18:12
  */
-public class CompanyBankReqVo {
+public class CompanyBankReqVo1 {
     /**
      * 银行卡id
      */

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

@@ -113,7 +113,7 @@ public class CompanyReqVo {
     /**
      * 银行卡列表
      */
-    private List<CompanyBankReqVo> bankList;
+    private List<CompanyBankReqVo1> bankList;
 
     public String getId() {
         return id;
@@ -267,11 +267,11 @@ public class CompanyReqVo {
         this.updateTime = updateTime;
     }
 
-    public List<CompanyBankReqVo> getBankList() {
+    public List<CompanyBankReqVo1> getBankList() {
         return bankList;
     }
 
-    public void setBankList(List<CompanyBankReqVo> bankList) {
+    public void setBankList(List<CompanyBankReqVo1> bankList) {
         this.bankList = bankList;
     }