From 5a4712918154a2ef49a108ea0afde697e8231f88 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 15 Nov 2023 11:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

---
 .../main/java/com/web/controller/OrderController.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 1e3963d2..8380d6c7 100644
--- a/hai-order/src/main/java/com/web/controller/OrderController.java
+++ b/hai-order/src/main/java/com/web/controller/OrderController.java
@@ -308,6 +308,15 @@ public class OrderController {
                 goodsOrderModel.setGoodsOrder(order);
                 goodsOrderModel.setGoodsDeliveryAddress(deliveryAddress);
 
+
+
+                return ResponseMsgUtil.success(goodsOrderModel);
+
+            } else if (highOrder.getProductType() == 17) {
+
+                GoodsOrderModel goodsOrderModel = new GoodsOrderModel();
+                BeanUtils.copyProperties(highOrder , goodsOrderModel);
+
                 HighGroupOrder highGroupOrder = groupCodeService.findGroupOrder(highOrder.getOrderNo());
 
                 JSONObject object = groupService.getGroupContent(highGroupOrder.getGroupId());
@@ -321,7 +330,6 @@ public class OrderController {
 
                 HighGroupCode highGroupCode = groupCodeService.findGroupCode(map);
                 goodsOrderModel.setHighGroupCode(highGroupCode);
-
                 return ResponseMsgUtil.success(goodsOrderModel);
 
             }