From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
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
index ca02d65..18bc9d1 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
@@ -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