From 83c9330f576c23aade710bcd996dedd19534e213 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 12:38:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 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 c9e9340..bd043cb 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
@@ -4,10 +4,15 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zy.asrs.entity.DocType;
 import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
@@ -19,7 +24,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -38,6 +45,8 @@
 
     @Autowired
     private OrderService orderService;
+    @Autowired
+    private OrderDetlService orderDetlService;
     @Autowired
     private ApiLogService apiLogService;
     @Autowired
@@ -62,9 +71,25 @@
 
         //鏉′欢鎷兼帴
         log.info("鏉′欢鎷兼帴");
+        String entryIds = null;
+//        if (kingDeeUtilType.entryId==1){
+//            List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//            for (OrderDetl orderDetl:orderDetls){
+//                if (Cools.isEmpty(entryIds)){
+//                    entryIds = orderDetl.getOrigin();
+//                }else {
+//                    entryIds = entryIds+"," +orderDetl.getOrigin();
+//                }
+//            }
+//            orderNoS = "";
+//        }
+        if (Cools.isEmpty(entryIds)){
+            entryIds = "";
+        }
+
         JSONObject dataJsonObject = new JSONObject();
         dataJsonObject.put("Numbers",orderNoS);
-        dataJsonObject.put("EntryIds","");
+        dataJsonObject.put("EntryIds",entryIds);
         dataJsonObject.put("RuleId",kingDeeUtilType.ruleId);
         dataJsonObject.put("TargetFormId",kingDeeUtilType.correspondingFormId);
 
@@ -90,14 +115,20 @@
                     .setHttps(true)
                     .build()
                     .doPost();
-            JSONObject data = JSON.parseObject(response);
+//            JSONObject data = JSON.parseObject(response);
             log.info("涓嬫帹response:"+response);
-            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
-            String bool=IsSuccess.toString();
+//            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);
+
             //涓嬫帹瀹屾垚鍘熻鍗�4杞�6  6.涓婃姤瀹屾垚
-            if(bool.equals("true")){
+            if(bool){
                 success = true;
                 order.setSettle(6L);
+                order.setUpdateTime(new Date());
                 orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
             }
         } catch (Exception e) {

--
Gitblit v1.9.1