From f8655de7b212ec6a39e61e508804f9e97c9f5d1e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 26 五月 2020 13:14:49 +0800
Subject: [PATCH] 优化 api listener 开发间接

---
 java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java b/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
index 469d43a..ca02d65 100644
--- a/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
+++ b/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
@@ -2,13 +2,14 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.util.Assert;
-import com.java110.common.util.DateUtil;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
 import com.java110.entity.order.Business;
 import com.java110.entity.order.BusinessAttrs;
 import com.java110.entity.order.Orders;
 import com.java110.entity.order.OrdersAttrs;
+import com.java110.utils.util.StringUtil;
 
 import java.util.*;
 
@@ -81,6 +82,9 @@
         //鏋勫缓杩斿洖澶�
         builderResHeaders();
 
+        //鏋勫缓杩斿洖json 涓簕"msg":[]}
+        builderResJson();
+
         //鏋勫缓 璁㈠崟淇℃伅
         builderOrders();
 
@@ -133,6 +137,14 @@
         Assert.jsonObjectHaveKey(tmpOrderJson,"orderTypeCd","璇锋眰鎶ユ枃閿欒锛屾湭鎵惧埌orderTypeCd鑺傜偣");
         this.orders.setOrderTypeCd(tmpOrderJson.getString("orderTypeCd"));
 
+        if(tmpOrderJson.containsKey("orderProcess") && !StringUtil.isEmpty(tmpOrderJson.getString("orderProcess"))){
+            this.orders.setOrderProcess(tmpOrderJson.getString("orderProcess"));
+        }
+
+        if(tmpOrderJson.containsKey("oId") && !StringUtil.isEmpty(tmpOrderJson.getString("oId"))){
+            this.orders.setoId(tmpOrderJson.getString("oId"));
+        }
+
         if(!tmpOrderJson.containsKey("attrs")){
             return ;
         }
@@ -160,6 +172,9 @@
     private void builderBusiness() {
 
         this.businessList = new ArrayList<Business>();
+        if(!this.getReqJson().containsKey("business")){
+            return;
+        }
 
         JSONArray tmpBusiness = this.getReqJson().getJSONArray("business");
 
@@ -214,6 +229,15 @@
         }
     }
 
+    /**
+     * 鍒濆鍖栨瀯寤鸿繑鍥炴姤鏂�
+     */
+    private void builderResJson(){
+        JSONObject resJson = new JSONObject();
+        resJson.put("msg",new JSONArray());
+        this.setResJson(resJson);
+    }
+
 
     public Orders getOrders() {
         return orders;

--
Gitblit v1.8.0