From ff98dce5d697563771adf7ae08cae895d234874b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 02 七月 2024 13:11:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index f045f22..263758a 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -22,6 +22,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -77,7 +79,7 @@
             JSONObject std_data = jsonObject.getJSONObject("std_data");
             JSONObject execution = std_data.getJSONObject("execution");
             String code = execution.getString("code");
-            JSONObject std_data1 = jsonObject.getJSONObject("parameter");
+            JSONObject std_data1 = std_data.getJSONObject("parameter");
             JSONObject execution1 = std_data1.getJSONObject("response_result");
             String status = execution1.getString("Status");
 
@@ -88,6 +90,7 @@
                     throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
                 }
             } else {
+                orderService.updateSettle(order.getId(), 7L, null);
                 log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
                 throw new CoolException("涓婃姤mes绯荤粺澶辫触");
             }
@@ -139,20 +142,35 @@
     }
 
     Map<String, Object> getHeaders(){
+//        digi-type: sync
+//        digi-protocol: raw
+//        digi-host: {"prod":"XThirdParty","ver":"1.0","ip":"61.153.227.86","id":"XWMS","timezone":"+8","timestamp":"20240613062240538","acct":"dcms"}
+//        digi-service: {"prod":"E10","name":"XCommon.ImportData","id":"XFX","ip":"139.196.196.39"}
+//        digi-key: 504011D3B5AD32B465FE0C097C7FDAAC
+//        digi-datakey: XCommon.ImportData
+        // 鑾峰彇褰撳墠鏃堕棿
+        LocalDateTime now = LocalDateTime.now();
+
+        // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡鍖栧櫒锛屾牴鎹綘鐨勯渶姹傚畾涔夋牸寮�
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
+
+        // 鏍煎紡鍖栨棩鏈熸椂闂翠负瀛楃涓�
+        String formattedDateTime = now.format(formatter);
+
         JSONObject digiHost = new JSONObject();
         digiHost.put("prod","XThirdParty");
         digiHost.put("ver","1.0");
-        digiHost.put("ip","192.168.10.160");
+        digiHost.put("ip","61.153.227.86");
         digiHost.put("id","XWMS");
         digiHost.put("timezone","+8");
-        digiHost.put("timestamp",new Date().getTime());
+        digiHost.put("timestamp",formattedDateTime);
         digiHost.put("acct","dcms");
 
         JSONObject digiService = new JSONObject();
         digiService.put("prod","E10");
         digiService.put("name","XCommon.ImportData");
-        digiService.put("ip","192.168.10.160");
-        digiService.put("id","SW_TEST_External");
+        digiService.put("ip","139.196.196.39");
+        digiService.put("id","XFX");
 
         String key = digiHost.toJSONString() + digiService.toJSONString();
         String keyMd5 = DigestUtils.md5Hex(key);

--
Gitblit v1.9.1