From e95640a4adde0440c89e8e893a8a20cf0a95f31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 5 Dec 2024 13:47:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A5=97=E9=A4=90=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/po/OrderPo.java         | 1 -
 .../system/cashierservice/entity/po/SkuInfoPo.java       | 1 +
 src/main/resources/mapper/TbOrderInfoMapper.xml          | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
index 12cc12c..b1f2ce9 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
@@ -31,7 +31,6 @@ public class OrderPo {
     private BigDecimal discountRatio;
 
     private BigDecimal discountAmount;
-    private String proGroupInfo;
 
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/SkuInfoPo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/SkuInfoPo.java
index 2bf1b31..121c560 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/SkuInfoPo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/SkuInfoPo.java
@@ -14,4 +14,5 @@ public class SkuInfoPo {
     private BigDecimal packAmount;
     private String categoryId;
     private BigDecimal price;
+    private String proGroupInfo;
 }
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index c433288..0c19221 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -80,8 +80,7 @@
         toi.remark,
         toi.master_id as masterId,
         toi.discount_ratio as discountRatio,
-        toi.discount_amount as discountAmount,
-        tod.pro_group_info as proGroupInfo
+        toi.discount_amount as discountAmount
 
 
         FROM
@@ -613,7 +612,8 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
             c.category_id AS categoryId,
             d.price_amount as priceAmount,
             d.pack_amount as packAmount,
-            d.price as price
+            d.price as price,
+            d.pro_group_info as proGroupInfo
         FROM
             tb_order_detail d
                 LEFT JOIN tb_cashier_cart c ON d.order_id = c.order_id
@@ -633,7 +633,8 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
             '' AS categoryId,
             d.price_amount as priceAmount,
             d.pack_amount as packAmount,
-            d.price as price
+            d.price as price,
+            d.pro_group_info as proGroupInfo
         FROM
             tb_order_detail d
         where d.order_id=#{orderId}