Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

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());
 

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;
 
 }