From d31920a1233ab14cdd5e33756bb1b0e3ed235e66 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期三, 08 九月 2021 12:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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
old mode 100644
new mode 100755
index ca02d65..18bc9d1
--- a/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
+++ b/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
@@ -130,7 +130,13 @@
 
         this.orders.setRequestTime(this.getReqHeaders().get(CommonConstant.HTTP_REQ_TIME));
 
-        this.orders.setoId("-1");
+        String oId = this.getReqHeaders().get(CommonConstant.O_ID);
+
+        if(StringUtil.isEmpty(oId)){
+            oId = "-1";
+        }
+
+        this.orders.setoId(oId);
 
         JSONObject tmpOrderJson = this.getReqJson().getJSONObject("orders");
 

--
Gitblit v1.8.0