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}