修改余额为0的处理，

添加银行卡空指针问题

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

@@ -57,12 +57,12 @@ public class CompanyController {
         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);
-    }
+//    @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);
+//    }
 
 //    @RequestMapping(value = "/examineCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 //    @ApiOperation(value = "审核配置公司信息", notes = "返回审核配置的结果")
@@ -83,28 +83,30 @@ public class CompanyController {
         return ResponseResult.result(companyService.findCompanyBalance(req));
     }
 
-    @RequestMapping(value = "/checkAgreement")
-    @ApiOperation(value = "查询公司是否已签署某合同", notes = "返回合同信息")
-    public ResponseResult checkAgreement(@RequestBody CompanyAgreementReqVo req) {
-        CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
-//                .notBlankCheck("agreementCode", req.getAgreementCode())
+    @RequestMapping(value = "/findCompanyAgreement")
+    @ApiOperation(value = "查询某合同详情", notes = "返回合同信息")
+    public ResponseResult<CompanyAgreementVo> findCompanyAgreement(@RequestBody CompanyAgreementReqVo req) {
+        CheckerHelper.newInstance()
+//                .notBlankCheck("companyId", req.getCompanyId())
+//                .notBlankCheck("agreementId", req.getAgreementId())
+                .notBlankCheck("companyAgreementId", req.getCompanyAgreementId())
                 .checkException();
-        return ResponseResult.resultAllowNull(companyAgreementService.checkAgreement(req));
+        return ResponseResult.result(companyAgreementService.findCompanyAgreement(req));
     }
 
-    @RequestMapping(value = "/findCompanyAgreement")
-    @ApiOperation(value = "查询公司签署的合同", notes = "返回合同信息")
-    public ResponseResult<PageSizeData<CompanyAgreementVo>> findCompanyAgreement(@RequestBody CompanyAgreementReqVo req) {
+    @RequestMapping(value = "/findCompanyAgreementList")
+    @ApiOperation(value = "查询公司签署的合同列表", notes = "返回合同信息")
+    public ResponseResult<PageSizeData<CompanyAgreementVo>> findCompanyAgreementList(@RequestBody CompanyAgreementReqVo req) {
         CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
                 .checkException();
-        return ResponseResult.result(companyAgreementService.findCompanyAgreement(req));
+        return ResponseResult.result(companyAgreementService.findCompanyAgreementList(req));
     }
 
     @RequestMapping(value = "saveComapnyAgreement")
     @ApiOperation(value = "公司签署合同", notes = "返回签署结果")
     public ResponseResult saveCompanyAgreement(@RequestBody CompanyAgreementReqVo req){
         CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
-//                .notBlankCheck("agreementId", req.getAgreementId())
+                .notBlankCheck("agreementId", req.getAgreementId())
                 .notBlankCheck("agreementCode", req.getAgreementCode())
                 .checkException();
         return ResponseResult.result(companyAgreementService.saveCompanyAgreement(req));

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

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.vo.reqvo.GetCompanyReqVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
+import com.pangding.web.vo.system.req.company.GetCompanyReqVo;
 import com.yanzuoguang.dao.BaseDao;
 
 public interface CompanyDivideRuleDao extends BaseDao {

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

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.CompanyDivideRuleDao;
-import com.pangding.web.authority.vo.reqvo.GetCompanyReqVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
 import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
+import com.pangding.web.vo.system.req.company.GetCompanyReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 

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

@@ -7,10 +7,10 @@ import com.yanzuoguang.util.vo.PageSizeData;
 
 public interface CompanyAgreementService {
 
-    CompanyAgreementResVo checkAgreement(CompanyAgreementReqVo req);
+    CompanyAgreementResVo findCompanyAgreement(CompanyAgreementReqVo req);
 
     CompanyAgreementVo saveCompanyAgreement(CompanyAgreementReqVo req);
 
 
-    PageSizeData<CompanyAgreementVo> findCompanyAgreement(CompanyAgreementReqVo req);
+    PageSizeData<CompanyAgreementVo> findCompanyAgreementList(CompanyAgreementReqVo req);
 }

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

 package com.pangding.web.authority.service.impl;
 
+import com.pangding.web.authority.dao.AgreementTemplateDao;
 import com.pangding.web.authority.dao.CompanyAgreementDao;
 import com.pangding.web.authority.dao.company.CompanyDao;
 import com.pangding.web.authority.dao.company.CompanyExtendDao;
 import com.pangding.web.authority.service.CompanyAgreementService;
+import com.pangding.web.vo.system.pd.AgreementTemplateVo;
 import com.pangding.web.vo.system.pd.company.CompanyAgreementVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
@@ -22,25 +24,30 @@ public class CompanyAgreementServiceImpl implements CompanyAgreementService {
 
     private final CompanyAgreementDao companyAgreementDao;
 
+    private final AgreementTemplateDao agreementTemplateDao;
+
     private final CompanyDao companyDao;
 
     private final CompanyExtendDao companyExtendDao;
 
 
-    public CompanyAgreementServiceImpl(CompanyAgreementDao companyAgreementDao, CompanyDao companyDao, CompanyExtendDao companyExtendDao) {
+    public CompanyAgreementServiceImpl(CompanyAgreementDao companyAgreementDao,
+                                       AgreementTemplateDao agreementTemplateDao,
+                                       CompanyDao companyDao, CompanyExtendDao companyExtendDao) {
         this.companyAgreementDao = companyAgreementDao;
+        this.agreementTemplateDao = agreementTemplateDao;
         this.companyDao = companyDao;
         this.companyExtendDao = companyExtendDao;
     }
 
     @Override
-    public CompanyAgreementResVo checkAgreement(CompanyAgreementReqVo req) {
+    public CompanyAgreementResVo findCompanyAgreement(CompanyAgreementReqVo req) {
         CompanyAgreementResVo companyAgreementResVo = companyAgreementDao.load(req, CompanyAgreementResVo.class);
         return companyAgreementResVo;
     }
 
     @Override
-    public PageSizeData<CompanyAgreementVo> findCompanyAgreement(CompanyAgreementReqVo req) {
+    public PageSizeData<CompanyAgreementVo> findCompanyAgreementList(CompanyAgreementReqVo req) {
         PageSizeData<CompanyAgreementVo> companyAgreementResVo = companyAgreementDao.findCompanyAgreement(req);
         return companyAgreementResVo;
     }
@@ -53,7 +60,11 @@ public class CompanyAgreementServiceImpl implements CompanyAgreementService {
             throw new CodeException("未找到公司信息");
         }
 
-        String id = StringHelper.getMD5Id(req.getCompanyId(), req.getAgreementCode());
+        AgreementTemplateVo agreementTemplateVo = agreementTemplateDao.load(req.getAgreementId(), AgreementTemplateVo.class);
+        if(StringHelper.isEmpty(agreementTemplateVo)){
+            throw new CodeException("未找到可签约的合同");
+        }
+        String id = StringHelper.getMD5Id(req.getCompanyId(), req.getAgreementId());
         CompanyAgreementVo companyAgreementVo = companyAgreementDao.load(id, CompanyAgreementVo.class);
         if (!StringHelper.isEmpty(companyAgreementVo)) {
             throw new CodeException("已签署合同");
@@ -61,6 +72,11 @@ public class CompanyAgreementServiceImpl implements CompanyAgreementService {
         companyAgreementVo = new CompanyAgreementVo();
         ObjectHelper.writeWithFrom(companyAgreementVo, req);
         companyAgreementVo.setCompanyAgreementId(id);
+        companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
+        companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
+        companyAgreementVo.setAgreementFilePath(agreementTemplateVo.getAgreementFileUrl());
+        companyAgreementVo.setCreateTime(DateHelper.getNow());
+        companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
         companyAgreementDao.create(companyAgreementVo);
 
         CompanyExtendVo companyExtendVo = new CompanyExtendVo();

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

@@ -27,6 +27,7 @@ import com.pangding.web.util.RSAUtils;
 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.system.pd.AgreementTemplateVo;
 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;
@@ -36,6 +37,7 @@ import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.authority.RoleReqVo;
 import com.pangding.web.vo.system.req.authority.UserRoleReqVo;
 import com.pangding.web.vo.system.req.company.*;
+import com.pangding.web.vo.system.req.company.GetCompanyReqVo;
 import com.pangding.web.vo.system.res.company.*;
 import com.pangding.web.vo.wechat.req.code.QrCodeReqVo;
 import com.pangding.web.vo.wechat.req.code.Scene;
@@ -43,7 +45,6 @@ import com.pangding.web.vo.wechat.req.code.SceneInfo;
 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;
@@ -74,6 +75,8 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private CompanyExtendDao companyExtendDao;
     @Autowired
+    private CompanyAgreementDao companyAgreementDao;
+    @Autowired
     private CompanyBankCardDao companyBankCardDao;
     @Autowired
     private UserRoleDao userRoleDao;
@@ -100,6 +103,8 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private CompanyTollPointDao companyTollPointDao;
     @Autowired
+    private AgreementTemplateDao agreementTemplateDao;
+    @Autowired
     private PayFeign payFeign;
     @Autowired
     private StoreFeign storeFeign;
@@ -273,6 +278,12 @@ public class CompanyServiceImpl implements CompanyService {
             /*获取公司扩展表信息*/
             CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getId(), CompanyExtendVo.class);
             resVo.setCompanyExtendVo(companyExtendVo);
+
+            // 公司合同信息
+            CompanyAgreementVo companyAgreementVo = new CompanyAgreementVo();
+            companyAgreementVo.setCompanyId(reqVo.getId());
+            List<CompanyAgreementVo> companyAgreementVos = companyAgreementDao.loadList(companyAgreementVo, CompanyAgreementVo.class);
+            resVo.setCompanyAgreementList(companyAgreementVos);
             // 获取公司规则信息
             CompanyRuleReqVo companyRuleReqVo = new CompanyRuleReqVo();
             companyRuleReqVo.setCompanyId(companyVo.getId());
@@ -1179,8 +1190,41 @@ public class CompanyServiceImpl implements CompanyService {
         companyVo.setExamineStatus(reqVo.getExamineStatus());
         companyVo.setExamineFailedReason(reqVo.getExamineFailedReason());
         companyVo.setExpirationDate(reqVo.getExpirationDate());
+        companyVo.setSigningType(reqVo.getSigningType());
+        companyVo.setSigningStatus(reqVo.getSigningStatus());
+        companyVo.setSigningTime(reqVo.getSigningTime());
         companyDao.update(companyVo);
 
+        AgreementTemplateVo agreementTemplateVo = agreementTemplateDao.load(reqVo.getCompanyAgreementReqVo().getAgreementId(), AgreementTemplateVo.class);
+        if(StringHelper.isEmpty(agreementTemplateVo)){
+            throw new CodeException("未找到可签约的合同");
+        }
+        String id = StringHelper.getMD5Id(reqVo.getCompanyId(), reqVo.getCompanyAgreementReqVo().getAgreementId());
+        CompanyAgreementVo companyAgreementVo = companyAgreementDao.load(id, CompanyAgreementVo.class);
+        if (!StringHelper.isEmpty(companyAgreementVo)) {
+            ObjectHelper.writeWithFrom(companyAgreementVo, reqVo.getCompanyAgreementReqVo());
+            companyAgreementVo.setCompanyAgreementId(id);
+            companyAgreementVo.setCompanyId(reqVo.getCompanyId());
+            companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
+            companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
+            companyAgreementVo.setAgreementFilePath(reqVo.getCompanyAgreementReqVo().getAgreementFilePath());
+            companyAgreementVo.setCreateTime(DateHelper.getNow());
+            companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
+            companyAgreementDao.update(companyAgreementVo);
+        }else{
+            companyAgreementVo = new CompanyAgreementVo();
+            ObjectHelper.writeWithFrom(companyAgreementVo, reqVo.getCompanyAgreementReqVo());
+            companyAgreementVo.setCompanyAgreementId(id);
+            companyAgreementVo.setCompanyId(reqVo.getCompanyId());
+            companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
+            companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
+            companyAgreementVo.setAgreementFilePath(reqVo.getCompanyAgreementReqVo().getAgreementFilePath());
+            companyAgreementVo.setCreateTime(DateHelper.getNow());
+            companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
+            companyAgreementDao.create(companyAgreementVo);
+        }
+
+
         // 更新或新增提现规则表
         if (1 == reqVo.getDiscountRule()) {
             saveCompanyRule(reqVo.getCompanyRuleVoList(), companyVo);

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

 package com.pangding.web.authority.vo.reqvo;
 
+import com.pangding.web.vo.system.req.company.GetCompanyReqVo;
+
 import java.util.List;
 
+
 public class CompanyDivideReqVo {
 
     public String companyId;

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.vo.reqvo;
 
 import com.pangding.web.vo.system.pd.company.CompanyInvitationRuleVo;
 import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
+import com.pangding.web.vo.system.req.company.CompanyAgreementReqVo;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -129,6 +130,12 @@ public class ExamineConfigReqVo {
     private Integer serviceChargePayType;
     @ApiModelProperty(notes = "服务费")
     private Double serviceCharge;
+    @ApiModelProperty(notes = "签约类型0-线上，1-线下")
+    private Integer signingType;
+    @ApiModelProperty(notes = "签约状态")
+    private Integer signingStatus;
+    @ApiModelProperty(notes = "签约时间")
+    private String signingTime;
 
     /**
      * 二维码类型(0:关注;1:付款;2:源码)
@@ -170,6 +177,8 @@ public class ExamineConfigReqVo {
 
     @ApiModelProperty(notes = "公司邀请规则")
     private List<CompanyInvitationRuleVo> companyInvitationRewardRuleVoList;
+    @ApiModelProperty(notes = "签约信息")
+    private CompanyAgreementReqVo companyAgreementReqVo;
 
     public String getCompanyId() {
         return companyId;
@@ -506,4 +515,36 @@ public class ExamineConfigReqVo {
     public void setServiceChargePayType(Integer serviceChargePayType) {
         this.serviceChargePayType = serviceChargePayType;
     }
+
+    public Integer getSigningType() {
+        return signingType;
+    }
+
+    public void setSigningType(Integer signingType) {
+        this.signingType = signingType;
+    }
+
+    public Integer getSigningStatus() {
+        return signingStatus;
+    }
+
+    public void setSigningStatus(Integer signingStatus) {
+        this.signingStatus = signingStatus;
+    }
+
+    public String getSigningTime() {
+        return signingTime;
+    }
+
+    public void setSigningTime(String signingTime) {
+        this.signingTime = signingTime;
+    }
+
+    public CompanyAgreementReqVo getCompanyAgreementReqVo() {
+        return companyAgreementReqVo;
+    }
+
+    public void setCompanyAgreementReqVo(CompanyAgreementReqVo companyAgreementReqVo) {
+        this.companyAgreementReqVo = companyAgreementReqVo;
+    }
 }

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

-package com.pangding.web.authority.vo.reqvo;
-
-public class GetCompanyReqVo {
-
-    private String companyId;
-
-    private int companyChannelType;
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public int getCompanyChannelType() {
-        return companyChannelType;
-    }
-
-    public void setCompanyChannelType(int companyChannelType) {
-        this.companyChannelType = companyChannelType;
-    }
-}

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

@@ -27,6 +27,8 @@ public class CompanyLoginResVo {
 
     private CompanyBankCardVo bankCardVo;
 
+    private List<CompanyAgreementVo> companyAgreementList;
+
     private RoleVo roleVo;
 
     private List<RoleVo> roleVoList;
@@ -135,4 +137,12 @@ public class CompanyLoginResVo {
     public void setPaydJumpUrl(String paydJumpUrl) {
         this.paydJumpUrl = paydJumpUrl;
     }
+
+    public List<CompanyAgreementVo> getCompanyAgreementList() {
+        return companyAgreementList;
+    }
+
+    public void setCompanyAgreementList(List<CompanyAgreementVo> companyAgreementList) {
+        this.companyAgreementList = companyAgreementList;
+    }
 }