From 03b8dff85b64b47134b18822882d90b84aa58bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Mon, 29 Jul 2024 10:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
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        | 4 ++++
 src/main/resources/mapper/TbOrderInfoMapper.xml           | 8 ++++++--
 3 files changed, 11 insertions(+), 2 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 6ff778f..e5dadf1 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
@@ -25,6 +25,7 @@ public class OrderPo {
     private String outNumber;
     private String tableName;
     private List<SkuInfoPo> skuInfos;
+    private String remark;
 
 
 }
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 f972a64..b81d664 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
@@ -2,11 +2,15 @@ package com.chaozhanggui.system.cashierservice.entity.po;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class SkuInfoPo {
 
     private String productName;
     private String productSkuName;
     private Integer num;
+    private BigDecimal priceAmount;
+    private BigDecimal packAmount;
     private String categoryId;
 }
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index c51f0f4..b423482 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -75,7 +75,9 @@
         GROUP_CONCAT(tod.product_name)  AS productName,
         toi.STATUS,
         toi.out_number AS outNumber,
-        toi.table_name AS tableName
+        toi.table_name AS tableName,
+        toi.remark
+
 
         FROM
         tb_order_info toi
@@ -592,7 +594,9 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
             d.product_name AS productName,
             d.num,
             d.product_sku_name AS productSkuName,
-            c.category_id AS categoryId
+            c.category_id AS categoryId,
+            d.price_amount as priceAmount,
+            d.pack_amount as packAmount
         FROM
             tb_order_detail d
                 LEFT JOIN tb_cashier_cart c ON d.order_id = c.order_id