Browse Source

no message

FengChaoYu 3 months ago
parent
commit
2706b8b3ec

+ 15 - 8
mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -682,15 +682,22 @@ public class WebsitContractSignLogic {
             if (status.getKey().equals(SignContractStatusEnum.OK.getKey())) {
                 if (signItem.getNeedPartyASign().equals(IsYesNoEnum.YES.getKey())) {
                     //甲方签署
-                    JSONObject object = Auth4FDDUtil.extSignAuto(IdWorker.getIdStr(), signItem.getFadadaContractId(),
-                            signItem.getCaCustomerId(), "甲方签章", "0",
-                            signItem.getPartyASignFiled(), "", "", "");
-                    log.info(signItem.getFadadaContractId() + " 甲方签章结果:{}", object);
-
-                    // 法大大合同归档
-                    JSONObject object1 = Auth4FDDUtil.contractFiling(signItem.getFadadaContractId());
-                    log.info(signItem.getFadadaContractId() + " 合同归档结果:{}", object1);
+                    try {
+                        JSONObject object = Auth4FDDUtil.extSignAuto(IdWorker.getIdStr(), signItem.getFadadaContractId(),
+                                signItem.getCaCustomerId(), "甲方签章", "0",
+                                signItem.getPartyASignFiled(), "", "", "");
+                        log.info(signItem.getFadadaContractId() + " 甲方签章结果:{}", object);
+                    } catch (Exception e) {
+                        if (!e.getMessage().contains("合同已归档")) {
+                            throw new RemoteServiceException(e.getMessage());
+                        }
+                    }
                 }
+
+                // 法大大合同归档
+                JSONObject object1 = Auth4FDDUtil.contractFiling(signItem.getFadadaContractId());
+                log.info(signItem.getFadadaContractId() + " 合同归档结果:{}", object1);
+
                 websitContractSignItemService.lambdaUpdate()
                         .set(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.OK.getKey())
                         .set(WebsitContractSignItem::getConfirmBy, adminUser.getNickName())