新需求

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

@@ -506,5 +506,9 @@ public class TaCompanyController extends BaseController {
                                   @RequestParam(value = "msg_digest",required = false) String msg_digest,
                                   HttpServletRequest request) {
         logger.info("企业认证回调函数参数:交易号 {},合同编号 {}，签章结果代码 {}，签章结果描述 ，{}, 下载地址{}, 查看地址 {},请求时间 {}, 摘要 {} ",transaction_id,contract_id,result_code,result_desc,download_url,viewpdf_url,timestamp,msg_digest);
+        TaContract taContract = iTaContractService.getById(contract_id);
+        taContract.setContractDownloadUrl(download_url);
+        taContract.setContractViewUrl(viewpdf_url);
+        iTaContractService.updateById(taContract);
     }
 }

src/main/java/com/huiju/estateagents/eContract/entity/TaContractBusiness.java

@@ -119,7 +119,7 @@ public class TaContractBusiness implements Serializable {
     private String contractTemplateAddress;
 
     @TableField(exist = false)
-    private String signatrueId;
+    private String signatureId;
 
     @TableField(exist = false)
     private String fadadaCode;

src/main/java/com/huiju/estateagents/eContract/service/ITaContractService.java

@@ -63,5 +63,5 @@ public interface ITaContractService extends IService<TaContract> {
      * @param person
      * @return
      */
-    String manualContract(TaContract taContract, TaPerson person);
+    String manualContract(TaContract taContract, TaPerson person) throws Exception;
 }

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

@@ -95,6 +95,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
 
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
 
         //先入合同表
         TaContract taContract = new TaContract();
@@ -151,8 +154,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      * @return
      */
     @Override
-    public String
-    manualContract(TaContract taContract, TaPerson person) {
+    public String manualContract(TaContract taContract, TaPerson person) throws Exception {
         //获取客户信息
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
@@ -160,6 +162,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
 
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
 
         //手动签署合同
         String timeStamp = HttpsUtil.getTimeStamp();
@@ -173,7 +178,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-//        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
+        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
         req.setNotify_url(fadadaProperties.getSignNotify());
         String signUrl = base.invokeExtSign(req);
         return signUrl;

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

@@ -86,7 +86,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         String verifyed_way = "0";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
-//        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
+        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
                 page_modify,notify_url,null,null,customer_ident_type,

src/main/resources/mapper/eContract/TaContractMapper.xml

@@ -110,7 +110,7 @@
         SELECT
             t.*,
             c.contract_template_address,
-            s.signatrue_id,
+            s.signature_id,
             d.fadada_code
         FROM
             ta_contract_business t