From 3453471a923499d12c65a8a14e790e5c1382fd18 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 15 Nov 2023 14:10:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

---
 .../src/main/java/com/web/controller/OrderController.java  | 7 +++++++
 .../src/main/java/com/hai/model/GoodsOrderModel.java       | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/hai-order/src/main/java/com/web/controller/OrderController.java b/hai-order/src/main/java/com/web/controller/OrderController.java
index 8380d6c7..7ce68487 100644
--- a/hai-order/src/main/java/com/web/controller/OrderController.java
+++ b/hai-order/src/main/java/com/web/controller/OrderController.java
@@ -325,6 +325,13 @@ public class OrderController {
                     goodsOrderModel.setGroupData(object.getJSONObject("return_data"));
                 }
 
+                JSONObject objectStore = groupService.getStoreMsg(highGroupOrder.getStoreId());
+
+                if (objectStore.getString("return_code").equals("000000")) {
+                    goodsOrderModel.setStoreData(objectStore.getJSONObject("return_data"));
+                }
+
+
                 Map<String , Object> map = new HashMap<>();
                 map.put("orderId" , highOrder.getId());
 
diff --git a/hai-service/src/main/java/com/hai/model/GoodsOrderModel.java b/hai-service/src/main/java/com/hai/model/GoodsOrderModel.java
index b8598764..12cabe68 100644
--- a/hai-service/src/main/java/com/hai/model/GoodsOrderModel.java
+++ b/hai-service/src/main/java/com/hai/model/GoodsOrderModel.java
@@ -16,6 +16,8 @@ public class GoodsOrderModel extends HighOrder {
 
     JSONObject groupData;
 
+    JSONObject storeData;
+
     HighGroupCode highGroupCode;
 
 }