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 5e52d8f..f3feab0 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 @@ -11,7 +11,7 @@ public class SkuInfoPo { private String productSkuName; private BigDecimal num; private BigDecimal priceAmount; - private BigDecimal discountAmount; + private BigDecimal discountSaleAmount; private BigDecimal packAmount; private String categoryId; private BigDecimal price; 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 61843f3..84262a2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -1520,10 +1520,10 @@ public class OrderService { skuInfoPos = new ArrayList<>(); } skuInfoPos.forEach(item -> { - if (item.getDiscountAmount() != null) { - item.setPrice(item.getPrice().subtract(item.getDiscountAmount())); + if (item.getDiscountSaleAmount() != null) { + item.setPrice(item.getPrice().subtract(item.getDiscountSaleAmount())); if (item.getMemberPrice() != null) { - item.setMemberPrice(item.getMemberPrice().subtract(item.getDiscountAmount())); + item.setMemberPrice(item.getMemberPrice().subtract(item.getDiscountSaleAmount())); } } }); @@ -1534,10 +1534,10 @@ public class OrderService { skuInfoPos = new ArrayList<>(); } skuInfoPos.forEach(item -> { - if (item.getDiscountAmount() != null) { - item.setPrice(item.getPrice().subtract(item.getDiscountAmount())); + if (item.getDiscountSaleAmount() != null) { + item.setPrice(item.getPrice().subtract(item.getDiscountSaleAmount())); if (item.getMemberPrice() != null) { - item.setMemberPrice(item.getMemberPrice().subtract(item.getDiscountAmount())); + item.setMemberPrice(item.getMemberPrice().subtract(item.getDiscountSaleAmount())); } } }); diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml index 73b64b9..035d19b 100644 --- a/src/main/resources/mapper/TbOrderInfoMapper.xml +++ b/src/main/resources/mapper/TbOrderInfoMapper.xml @@ -611,7 +611,7 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId} d.product_sku_name AS productSkuName, c.category_id AS categoryId, d.price_amount as priceAmount, - d.discount_amount as discountAmount, + d.discount_sale_amount as discountSaleAmount, d.pack_amount as packAmount, d.price as price, d.member_price as memberPrice, @@ -635,7 +635,7 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId} d.product_sku_name AS productSkuName, '' AS categoryId, d.price_amount as priceAmount, - d.discount_amount as discountAmount, + d.discount_sale_amount as discountSaleAmount, d.pack_amount as packAmount, d.price as price, d.member_price as memberPrice,