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

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

View File

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

View File

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

View File

@@ -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}