傅行帆 5 年前
父节点
当前提交
9e9f0ed553

+ 5
- 2
src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java 查看文件

@@ -178,8 +178,11 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
178 178
                 taCompany.setStatus(companyJson.getInteger("status"));
179 179
                 taCompany.setReason(companyJson.getString("auditFailReason"));
180 180
 
181
-                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.s");
182
-                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime"),df));
181
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
182
+                String auditorTime = companyJson.getString("auditorTime");
183
+                int index = auditorTime.lastIndexOf(".");
184
+                String substringTime = auditorTime.substring(0, index);
185
+                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(substringTime,df));
183 186
             }
184 187
 
185 188
             //银行卡信息

+ 15
- 4
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java 查看文件

@@ -170,10 +170,12 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
170 170
         //反更新合同地址
171 171
         taContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
172 172
         taContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
173
-        taContractMapper.updateById(taContract);
174
-
175
-        //企业名称
173
+        taContract.setContractName(taContractBusiness.getContractTemplateName());
174
+        //合同详情
176 175
         taContract.setCompanyName(taContractBusiness.getCompanyName());
176
+        taContract.setSignatoryName(taContractBusiness.getCompanyName());
177
+        taContract.setSignatoryTime(LocalDateTime.now());
178
+        taContractMapper.updateById(taContract);
177 179
         return taContract;
178 180
     }
179 181
 
@@ -227,12 +229,21 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
227 229
         req.setContract_id(taContract.getContractId().toString());
228 230
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
229 231
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
232
+
230 233
         req.setDoc_title(taContractBusiness.getContractTemplateName());
231 234
         String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/signResult?id=" + taContract.getInvoiceTargetId(), "utf-8");
232 235
         String return_url=  fadadaProperties.getRedirectUrl() + "?appid=123&redirect="+ redirectUrl;
233 236
         req.setReturn_url(return_url);
234 237
         req.setNotify_url(fadadaProperties.getSignNotify());
235
-        String signUrl = base.invokeExtSign(req);
238
+        String signUrl = base.invokeExtSignDIY(req,"1","0");
239
+
240
+        //更新乙方数据
241
+        TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taContract.getInvoiceTargetId());
242
+        taContract.setCustomerName(taRaiseRecord.getUserName());
243
+        taContract.setCustomerTel(taRaiseRecord.getTel());
244
+        taContract.setCustomerIdcard(taRaiseRecord.getIdcard());
245
+        taContract.setCustomerTime(LocalDateTime.now());
246
+        taContractMapper.updateById(taContract);
236 247
         return signUrl;
237 248
     }
238 249
 

+ 0
- 1
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java 查看文件

@@ -88,7 +88,6 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
88 88
         newContractUser.setAuthStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
89 89
         newContractUser.setCreateDate(LocalDateTime.now());
90 90
         newContractUser.setOrgId(person.getOrgId());
91
-        newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
92 91
 
93 92
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
94 93
         GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());