傅行帆 5 лет назад
Родитель
Сommit
5dc8391423

+ 4
- 4
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java Просмотреть файл

589
         Map<String, String[]> parameterMap = request.getParameterMap();
589
         Map<String, String[]> parameterMap = request.getParameterMap();
590
         if ("3000".equals(result_code)){
590
         if ("3000".equals(result_code)){
591
             TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
591
             TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
592
-            taContract.setContractDownloadUrl(download_url);
593
-            taContract.setContractViewUrl(viewpdf_url);
592
+//            taContract.setContractDownloadUrl(download_url);
593
+//            taContract.setContractViewUrl(viewpdf_url);
594
             taContract.setStatus(CommConstant.STATUS_NORMAL);
594
             taContract.setStatus(CommConstant.STATUS_NORMAL);
595
             taContract.setCustomerTime(LocalDateTime.now());
595
             taContract.setCustomerTime(LocalDateTime.now());
596
             taContract.setReason(parameterMap.get("result_desc")[0]);
596
             taContract.setReason(parameterMap.get("result_desc")[0]);
604
             iTaContractService.updateById(taContract);
604
             iTaContractService.updateById(taContract);
605
         }else{
605
         }else{
606
             TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
606
             TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
607
-            taContract.setContractDownloadUrl(download_url);
608
-            taContract.setContractViewUrl(viewpdf_url);
607
+//            taContract.setContractDownloadUrl(download_url);
608
+//            taContract.setContractViewUrl(viewpdf_url);
609
             //签署失败
609
             //签署失败
610
             taContract.setStatus(2);
610
             taContract.setStatus(2);
611
             taContract.setReason(parameterMap.get("result_desc")[0]);
611
             taContract.setReason(parameterMap.get("result_desc")[0]);

+ 6
- 6
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java Просмотреть файл

123
         queryWrapper.eq("person_id",person.getPersonId());
123
         queryWrapper.eq("person_id",person.getPersonId());
124
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
124
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
125
         if (null != oldContract){
125
         if (null != oldContract){
126
-            oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
127
-            oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
126
+            oldContract.setContractDownloadUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
127
+            oldContract.setContractViewUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
128
             return oldContract;
128
             return oldContract;
129
         }
129
         }
130
 
130
 
170
         }
170
         }
171
 
171
 
172
         //反更新合同地址
172
         //反更新合同地址
173
-        taContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
174
-        taContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
173
+        taContract.setContractDownloadUrl(getFddServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
174
+        taContract.setContractViewUrl(getFddServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
175
         taContract.setContractName(taContractBusiness.getContractTemplateName());
175
         taContract.setContractName(taContractBusiness.getContractTemplateName());
176
         //合同详情
176
         //合同详情
177
         taContract.setCompanyName(taContractBusiness.getCompanyName());
177
         taContract.setCompanyName(taContractBusiness.getCompanyName());
313
         queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
313
         queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
314
         queryWrapper.eq("person_id",person.getPersonId());
314
         queryWrapper.eq("person_id",person.getPersonId());
315
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
315
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
316
-        oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
317
-        oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
316
+        oldContract.setContractDownloadUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
317
+        oldContract.setContractViewUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
318
         return oldContract;
318
         return oldContract;
319
     }
319
     }
320
 }
320
 }