bug fix

src/main/java/com/huiju/estateagents/eContract/controller/TaContractBusinessController.java

@@ -7,8 +7,18 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.eContract.entity.TaCompany;
+import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.entity.TaContractTemplate;
+import com.huiju.estateagents.eContract.service.ITaCompanySealService;
+import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
+import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
+import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.mapper.TaRaiseMapper;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.service.ITaRaiseService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +45,17 @@ public class TaContractBusinessController extends BaseController {
     @Autowired
     public ITaContractBusinessService iTaContractBusinessService;
 
+    @Autowired
+    private ITaContractTemplateService iTaContractTemplateService;
+
+    @Autowired
+    private TaRaiseMapper taRaiseMapper;
+
+    @Autowired
+    private ITaCompanyService iTaCompanyService;
+
+    @Autowired
+    private ITaCompanySealService iTaCompanySealService;
 
     /**
      * 分页查询列表
@@ -164,12 +185,18 @@ public class TaContractBusinessController extends BaseController {
                                         @RequestBody TaContractBusiness taContractBusiness, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaContractTemplate taContractTemplate = iTaContractTemplateService.getById(taContractBusiness.getContractTemplateId());
+            TaRaise taRaise = taRaiseMapper.getRaiseById(taContractBusiness.getTargetId(), getOrgId(request));
+            TaCompany taCompany = iTaCompanyService.getById(taContractBusiness.getCompanyId());
+
             Integer targetId = taContractBusiness.getTargetId();
             QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
             taContractBusinessQueryWrapper.eq("org_id", getOrgId(request));
             taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             taContractBusinessQueryWrapper.eq("target_id", targetId);
             taContractBusinessQueryWrapper.ne("contract_business_id", id);
+
+
             Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
             if (contractBusinessNum > 0){
                 responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
@@ -177,6 +204,9 @@ public class TaContractBusinessController extends BaseController {
             }
 
             taContractBusiness.setContractBusinessId(id);
+            taContractBusiness.setContractTemplateName(taContractTemplate.getContractTemplateName());
+            taContractBusiness.setTargetName(taRaise.getSalesBatchName());
+            taContractBusiness.setCompanyName(taCompany.getCompanyName());
             if (iTaContractBusinessService.updateById(taContractBusiness)){
                 responseBean.addSuccess(taContractBusiness);
             }else {

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.eContract.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fadada.sdk.client.FddClientBase;
 import com.fadada.sdk.client.authForfadada.FindCertInfo;
 import com.fadada.sdk.client.authForfadada.GetCompanyVerifyUrl;
@@ -210,21 +211,32 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
 
     @Override
     public String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception {
+        QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
+        taContractQueryWrapper.eq("target_type", CommConstant.AUTH);
+        taContractQueryWrapper.eq("company_id", companyId);
+        TaContract taContract = taContractMapper.selectOne(taContractQueryWrapper);
+
         TaCompany taCompany = taCompanyMapper.selectById(companyId);
         String timeStamp = HttpsUtil.getTimeStamp();
         String transactionId = "TRAN" + timeStamp;
-        TaContract taContract = new TaContract();
-        taContract.setCompanyId(companyId);
-        taContract.setOrgId(orgId);
-        taContract.setCreateDate(LocalDateTime.now());
-        taContract.setTargetType(CommConstant.AUTH);
-        taContract.setSignatoryName(taCompany.getCompanyName());
-        taContract.setCustomerName("法大大公司平台");
-        taContract.setSignatoryTime(LocalDateTime.now());
-        taContract.setCustomerTime(LocalDateTime.now());
-        taContract.setStatus(CommConstant.STATUS_UNACCALIMED);
-        taContract.setOrgId(orgId);
-        taContractMapper.insert(taContract);
+        if (taContract == null){
+            taContract = new TaContract();
+            taContract.setCompanyId(companyId);
+            taContract.setOrgId(orgId);
+            taContract.setCreateDate(LocalDateTime.now());
+            taContract.setTargetType(CommConstant.AUTH);
+            taContract.setSignatoryName(taCompany.getCompanyName());
+            taContract.setCustomerName("法大大公司平台");
+            taContract.setSignatoryTime(LocalDateTime.now());
+            taContract.setCustomerTime(LocalDateTime.now());
+            taContract.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taContract.setOrgId(orgId);
+            taContractMapper.insert(taContract);
+        }else{
+            taContract.setSignatoryTime(LocalDateTime.now());
+            taContract.setCustomerTime(LocalDateTime.now());
+            taContractMapper.updateById(taContract);
+        }
 
         Integer contractId = taContract.getContractId();
         String customerId = taCompany.getFadadaCode();