From 44d443aebc66dfa4b40940703dac5a189ad21c50 Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Fri, 18 Jul 2025 17:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=83=A8=E5=88=86=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E8=A7=A3=E9=94=81=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FrameContractController.java | 39 +++++++++- .../controller/PreContractController.java | 50 ++++++++++++ .../management/controller/XSHTController.java | 77 +++++++++++++++++++ .../tzcontroller/DeliveryReqController.java | 52 +++++++++++++ .../tzcontroller/TZXSHTController.java | 26 +++++++ .../tzcontroller/YQHTController.java | 26 +++++++ 6 files changed, 268 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/management/controller/FrameContractController.java b/src/main/java/com/management/controller/FrameContractController.java index c8ac30c..435774b 100644 --- a/src/main/java/com/management/controller/FrameContractController.java +++ b/src/main/java/com/management/controller/FrameContractController.java @@ -371,10 +371,10 @@ public class FrameContractController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(frameContractId, "framework_contract__c"); //解锁 if ("1".equals(frameContractData.getString("lock_status"))) { log.info("解锁"); - JSONObject unlockReq = crmRequestUtil.unlockCRM(frameContractId, "framework_contract__c"); JSONObject unlockRes = new JSONObject(); @@ -383,7 +383,7 @@ public class FrameContractController { } catch (RestClientException e) { e.printStackTrace(); } - System.out.println(unlockRes); + System.out.println("解锁" + unlockRes); } JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); @@ -397,6 +397,17 @@ public class FrameContractController { } System.out.println("回写结果为：" + backRes); + //上锁 + log.info("上锁"); + + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("上锁" + lockRes); //开始记录日志 JSONObject logRes = new JSONObject(); @@ -642,6 +653,19 @@ public class FrameContractController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(frameContractBGData.getString("original_data"), "framework_contract__c"); + //解锁 + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -653,6 +677,17 @@ public class FrameContractController { } System.out.println("回写结果为：" + backRes); + //上锁 + log.info("上锁"); + + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("上锁" + lockRes); //开始记录日志 JSONObject logRes = new JSONObject(); diff --git a/src/main/java/com/management/controller/PreContractController.java b/src/main/java/com/management/controller/PreContractController.java index b41e213..26dd363 100644 --- a/src/main/java/com/management/controller/PreContractController.java +++ b/src/main/java/com/management/controller/PreContractController.java @@ -303,6 +303,21 @@ public class PreContractController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(preContractId, "pre_signed_contract__c"); + //解锁 + if ("1".equals(preContractData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -315,6 +330,17 @@ public class PreContractController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + //开始记录日志 JSONObject logRes = new JSONObject(); try { @@ -558,6 +584,19 @@ public class PreContractController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(preContractBGData.getString("original_data"), "pre_signed_contract__c"); + //解锁 + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -569,6 +608,17 @@ public class PreContractController { } System.out.println("回写结果为：" + backRes); + //上锁 + log.info("上锁"); + + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("上锁" + lockRes); //开始记录日志 JSONObject logRes = new JSONObject(); diff --git a/src/main/java/com/management/controller/XSHTController.java b/src/main/java/com/management/controller/XSHTController.java index 2c597af..815e2db 100644 --- a/src/main/java/com/management/controller/XSHTController.java +++ b/src/main/java/com/management/controller/XSHTController.java @@ -504,6 +504,21 @@ public class XSHTController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(contractId, "SaleContractObj"); + //解锁 + if ("1".equals(contractData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); System.out.println("回写请求为：" + JSON.parseObject(JSON.toJSONString(backReq))); @@ -518,6 +533,17 @@ public class XSHTController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + logMap.put("send_memo", JSON.toJSONString(backRes)); //开始记录日志 @@ -952,6 +978,19 @@ public class XSHTController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(contractBGData.getString("original_data"), "SaleContractObj"); + //解锁 + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -964,6 +1003,18 @@ public class XSHTController { System.out.println("回写结果为：" + backRes); + //上锁 + log.info("上锁"); + + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("上锁" + lockRes); + //开始记录日志 JSONObject logRes = new JSONObject(); try { @@ -1101,6 +1152,21 @@ public class XSHTController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(contractId, "SaleContractObj"); + //解锁 + if ("1".equals(contractData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); System.out.println("回写请求为：" + JSON.parseObject(JSON.toJSONString(backReq))); @@ -1115,6 +1181,17 @@ public class XSHTController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + //开始记录日志 JSONObject logRes = new JSONObject(); try { diff --git a/src/main/java/com/management/tzcontroller/DeliveryReqController.java b/src/main/java/com/management/tzcontroller/DeliveryReqController.java index 5cdd4cf..248ae2d 100644 --- a/src/main/java/com/management/tzcontroller/DeliveryReqController.java +++ b/src/main/java/com/management/tzcontroller/DeliveryReqController.java @@ -223,6 +223,21 @@ public class DeliveryReqController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(deliveryId, "shipping_application__c"); + //解锁 + if ("1".equals(deliveryData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -235,6 +250,17 @@ public class DeliveryReqController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + //开始记录日志 JSONObject logRes = new JSONObject(); @@ -421,6 +447,21 @@ public class DeliveryReqController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(refundId, "return_application__c"); + //解锁 + if ("1".equals(refundData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -433,6 +474,17 @@ public class DeliveryReqController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + //开始记录日志 JSONObject logRes = new JSONObject(); diff --git a/src/main/java/com/management/tzcontroller/TZXSHTController.java b/src/main/java/com/management/tzcontroller/TZXSHTController.java index f8b0886..bf3f2c6 100644 --- a/src/main/java/com/management/tzcontroller/TZXSHTController.java +++ b/src/main/java/com/management/tzcontroller/TZXSHTController.java @@ -196,6 +196,21 @@ public class TZXSHTController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(salesOrderId, "SaleContractObj"); + //解锁 + if ("1".equals(salesOrderData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -208,6 +223,17 @@ public class TZXSHTController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + logMap.put("send_memo", JSON.toJSONString(backRes)); //开始记录日志 diff --git a/src/main/java/com/management/tzcontroller/YQHTController.java b/src/main/java/com/management/tzcontroller/YQHTController.java index faef6fe..94f8e70 100644 --- a/src/main/java/com/management/tzcontroller/YQHTController.java +++ b/src/main/java/com/management/tzcontroller/YQHTController.java @@ -179,6 +179,21 @@ public class YQHTController { } //开始回写 + JSONObject unlockReq = crmRequestUtil.unlockCRM(preContractId, "pre_signed_contract__c"); + //解锁 + if ("1".equals(preContractData.getString("lock_status"))) { + log.info("解锁"); + + JSONObject unlockRes = new JSONObject(); + + try { + unlockRes = restTemplate.postForObject(URLConstant.UNLOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + System.out.println("解锁" + unlockRes); + } + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); JSONObject backRes = new JSONObject(); @@ -191,6 +206,17 @@ public class YQHTController { System.out.println("回写结果为：" + backRes); + log.info("上锁"); + JSONObject lockRes = new JSONObject(); + + try { + lockRes = restTemplate.postForObject(URLConstant.LOCK_CRM_URL, unlockReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("上锁" + lockRes); + //开始记录日志 JSONObject logRes = new JSONObject();