Bladeren bron

新需求

傅行帆 5 jaren geleden
bovenliggende
commit
bc96916cc0

+ 4
- 0
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java Bestand weergeven

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

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/entity/TaContractBusiness.java Bestand weergeven

119
     private String contractTemplateAddress;
119
     private String contractTemplateAddress;
120
 
120
 
121
     @TableField(exist = false)
121
     @TableField(exist = false)
122
-    private String signatrueId;
122
+    private String signatureId;
123
 
123
 
124
     @TableField(exist = false)
124
     @TableField(exist = false)
125
     private String fadadaCode;
125
     private String fadadaCode;

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/service/ITaContractService.java Bestand weergeven

63
      * @param person
63
      * @param person
64
      * @return
64
      * @return
65
      */
65
      */
66
-    String manualContract(TaContract taContract, TaPerson person);
66
+    String manualContract(TaContract taContract, TaPerson person) throws Exception;
67
 }
67
 }

+ 8
- 3
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java Bestand weergeven

95
 
95
 
96
         //根据raiseId获取合同的所有参数
96
         //根据raiseId获取合同的所有参数
97
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
97
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
98
+        if (null == taContractBusiness){
99
+            throw new Exception("无合同模板,请和置业顾问联系");
100
+        }
98
 
101
 
99
         //先入合同表
102
         //先入合同表
100
         TaContract taContract = new TaContract();
103
         TaContract taContract = new TaContract();
151
      * @return
154
      * @return
152
      */
155
      */
153
     @Override
156
     @Override
154
-    public String
155
-    manualContract(TaContract taContract, TaPerson person) {
157
+    public String manualContract(TaContract taContract, TaPerson person) throws Exception {
156
         //获取客户信息
158
         //获取客户信息
157
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
159
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
158
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
160
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
160
 
162
 
161
         //根据raiseId获取合同的所有参数
163
         //根据raiseId获取合同的所有参数
162
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
164
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
165
+        if (null == taContractBusiness){
166
+            throw new Exception("无合同模板,请和置业顾问联系");
167
+        }
163
 
168
 
164
         //手动签署合同
169
         //手动签署合同
165
         String timeStamp = HttpsUtil.getTimeStamp();
170
         String timeStamp = HttpsUtil.getTimeStamp();
173
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
178
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
174
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
179
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
175
         req.setDoc_title(taContractBusiness.getContractTemplateName());
180
         req.setDoc_title(taContractBusiness.getContractTemplateName());
176
-//        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
181
+        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
177
         req.setNotify_url(fadadaProperties.getSignNotify());
182
         req.setNotify_url(fadadaProperties.getSignNotify());
178
         String signUrl = base.invokeExtSign(req);
183
         String signUrl = base.invokeExtSign(req);
179
         return signUrl;
184
         return signUrl;

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java Bestand weergeven

86
         String verifyed_way = "0";
86
         String verifyed_way = "0";
87
         String page_modify = "1";
87
         String page_modify = "1";
88
         String notify_url = fadadaProperties.getCompanyNotify();
88
         String notify_url = fadadaProperties.getCompanyNotify();
89
-//        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
89
+        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
90
         String customer_ident_type = "0";
90
         String customer_ident_type = "0";
91
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
91
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
92
                 page_modify,notify_url,null,null,customer_ident_type,
92
                 page_modify,notify_url,null,null,customer_ident_type,

+ 1
- 1
src/main/resources/mapper/eContract/TaContractMapper.xml Bestand weergeven

110
         SELECT
110
         SELECT
111
             t.*,
111
             t.*,
112
             c.contract_template_address,
112
             c.contract_template_address,
113
-            s.signatrue_id,
113
+            s.signature_id,
114
             d.fadada_code
114
             d.fadada_code
115
         FROM
115
         FROM
116
             ta_contract_business t
116
             ta_contract_business t