czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 订单查询返回套餐信息

Browse Source
This commit is contained in:
张松
2024-12-05 13:47:35 +08:00
parent 3fca6a7cb8
commit e95640a4ad
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
View File

@@ -31,7 +31,6 @@ public class OrderPo {
private BigDecimal discountRatio; private BigDecimal discountRatio;
private BigDecimal discountAmount; private BigDecimal discountAmount;
private String proGroupInfo;
} }

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/po/SkuInfoPo.java
View File

@@ -14,4 +14,5 @@ public class SkuInfoPo {
private BigDecimal packAmount; private BigDecimal packAmount;
private String categoryId; private String categoryId;
private BigDecimal price; private BigDecimal price;
private String proGroupInfo;
} }

9
src/main/resources/mapper/TbOrderInfoMapper.xml
View File

@@ -80,8 +80,7 @@
toi.remark, toi.remark,
toi.master_id as masterId, toi.master_id as masterId,
toi.discount_ratio as discountRatio, toi.discount_ratio as discountRatio,
toi.discount_amount as discountAmount, toi.discount_amount as discountAmount
tod.pro_group_info as proGroupInfo
FROM FROM
@@ -613,7 +612,8 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
c.category_id AS categoryId, c.category_id AS categoryId,
d.price_amount as priceAmount, d.price_amount as priceAmount,
d.pack_amount as packAmount, d.pack_amount as packAmount,
d.price as price d.price as price,
d.pro_group_info as proGroupInfo
FROM FROM
tb_order_detail d tb_order_detail d
LEFT JOIN tb_cashier_cart c ON d.order_id = c.order_id 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, '' AS categoryId,
d.price_amount as priceAmount, d.price_amount as priceAmount,
d.pack_amount as packAmount, d.pack_amount as packAmount,
d.price as price d.price as price,
d.pro_group_info as proGroupInfo
FROM FROM
tb_order_detail d tb_order_detail d
where d.order_id=#{orderId} where d.order_id=#{orderId}