From a6bee744b39fe44423624f0d268706c4257e4bba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 16 七月 2025 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
index 0a4b81e..a4205ef 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
@@ -60,17 +60,22 @@
String[] split = orderNo.split("-");
String orderNoS = split[0];
//鐧诲綍閲戣澏r
- log.info("鐧诲綍閲戣澏");
+// log.info("鐧诲綍閲戣澏");
ReturnT<String> start = loginAuthenticationHandler.start();
- log.info("鐧诲綍閲戣澏:start:"+start);
+// log.info("鐧诲綍閲戣澏:start:"+start);
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
+// if (kingDeeUtilType.entryId>1){
+// Order order1 = orderService.selectById(order.getId());
+// order1.setUpdateTime(new Date());
+// orderService.updateById(order1);
+// return SUCCESS;
+// }
//鏉′欢鎷兼帴
- log.info("鏉′欢鎷兼帴");
String entryIds = null;
if (kingDeeUtilType.entryId==1){
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
@@ -97,8 +102,6 @@
jsonObject.put("FormId",kingDeeUtilType.formId);
jsonObject.put("data", dataJsonObject);
String add = jsonObject.toJSONString();
- log.info("鏉′欢鎷兼帴:"+jsonObject);
-
//涓嬫帹
log.info("涓嬫帹");
String response = "";
@@ -117,19 +120,28 @@
.doPost();
// JSONObject data = JSON.parseObject(response);
log.info("涓嬫帹response:"+response);
-// Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
-// String bool=IsSuccess.toString();
- ObjectMapper objectMapper = new ObjectMapper();
- JsonNode rootNode = objectMapper.readTree(response);
- boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- log.info("涓嬫帹bool:"+bool);
+ Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
+ String bool1=IsSuccess.toString();
+ boolean bool = false;
+ if (bool1.equals("true")){
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode rootNode = objectMapper.readTree(response);
+ bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- //涓嬫帹瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
- if(bool){
- success = true;
- order.setSettle(6L);
- order.setUpdateTime(new Date());
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ //涓嬫帹瀹屾垚鍘熻鍗�0杞�1 1.涓嬫帹瀹屾垚
+ if(bool){
+ //鑾峰彇涓嬫帹璁㈠崟鍙�
+ String number=rootNode.get("Result").get("ResponseStatus").get("SuccessEntitys").get(0).get("Number").asText();
+ int id=Integer.valueOf(rootNode.get("Result").get("ResponseStatus").get("SuccessEntitys").get(0).get("Id").asText());
+ success = true;
+// order.setSettle(6L);
+ order.setMemo("1");
+ order.setShipCode(number);//涓嬫帹璁㈠崟鍙�
+ order.setPostFeeType(id);//涓嬫帹ID
+ order.setUpdateTime(new Date());
+
+ orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ }
}
} catch (Exception e) {
log.info("涓嬫帹error:"+response);
@@ -140,7 +152,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓嬫帹",
+ "1.涓嬫帹",
URL+ pushDowmAudit,
null,
"127.0.0.1",
--
Gitblit v1.9.1