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 60228be..5e52d8f 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 @@ -15,5 +15,6 @@ public class SkuInfoPo { private BigDecimal packAmount; private String categoryId; private BigDecimal price; + private BigDecimal memberPrice; private String proGroupInfo; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 37ff75c..61843f3 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -1521,7 +1521,10 @@ public class OrderService { } skuInfoPos.forEach(item -> { if (item.getDiscountAmount() != null) { - item.setPriceAmount(item.getPriceAmount().subtract(item.getDiscountAmount())); + item.setPrice(item.getPrice().subtract(item.getDiscountAmount())); + if (item.getMemberPrice() != null) { + item.setMemberPrice(item.getMemberPrice().subtract(item.getDiscountAmount())); + } } }); orderInfo.setSkuInfos(skuInfoPos); @@ -1532,7 +1535,10 @@ public class OrderService { } skuInfoPos.forEach(item -> { if (item.getDiscountAmount() != null) { - item.setPriceAmount(item.getPriceAmount().subtract(item.getDiscountAmount())); + item.setPrice(item.getPrice().subtract(item.getDiscountAmount())); + if (item.getMemberPrice() != null) { + item.setMemberPrice(item.getMemberPrice().subtract(item.getDiscountAmount())); + } } }); orderInfo.setSkuInfos(skuInfoPos); diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml index ed54032..73b64b9 100644 --- a/src/main/resources/mapper/TbOrderInfoMapper.xml +++ b/src/main/resources/mapper/TbOrderInfoMapper.xml @@ -614,6 +614,8 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId} d.discount_amount as discountAmount, d.pack_amount as packAmount, d.price as price, + d.member_price as memberPrice, + d.pro_group_info as proGroupInfo FROM tb_order_detail d @@ -636,6 +638,7 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId} d.discount_amount as discountAmount, d.pack_amount as packAmount, d.price as price, + d.member_price as memberPrice, d.pro_group_info as proGroupInfo FROM tb_order_detail d