From 72b67803396c746ee8ed949a677a65a134ef4e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 6 Nov 2024 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E4=BB=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/ProductController.java | 5 ++++- .../system/cashierservice/service/CartService.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java index 77fcd9a..b50857a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java @@ -121,15 +121,18 @@ public class ProductController { public Result choseEatModel(@Validated @RequestBody ChoseEatModelDTO choseEatModelDTO) { List cashierCartList = cartService.choseEatModel(choseEatModelDTO); BigDecimal amount = BigDecimal.ZERO; + BigDecimal memberAmount = BigDecimal.ZERO; ArrayList cashierCarts = new ArrayList<>(); for (TbCashierCart item : cashierCartList) { if (!TableConstant.CART_SEAT_ID.equals(item.getProductId())) { cashierCarts.add(item); } - amount = amount.add(item.getTotalAmount()); + amount = amount.add(item.getSalePrice().multiply(BigDecimal.valueOf(item.getTotalNumber())).add(item.getPackFee())); + memberAmount = memberAmount.add(item.getMemberPrice().multiply(BigDecimal.valueOf(item.getTotalNumber())).add(item.getPackFee())); } HashMap data = new HashMap<>(); data.put("amount", amount); + data.put("memberAmount", amount); data.put("info", cashierCarts); return Result.success(CodeEnum.SUCCESS, data); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 6fa0441..76661a1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -192,7 +192,7 @@ public class CartService { array.add(cashierCart); } if (cashierCart.getIsVip().equals((byte) 1)) continue; - if (!ignoreTableFee && cashierCart.getNumber() > 0) { + if ((!ignoreTableFee || !TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) && cashierCart.getNumber() > 0) { amount = amount.add(cashierCart.getSalePrice().multiply(BigDecimal.valueOf(cashierCart.getTotalNumber())).add(cashierCart.getPackFee())); memberAmount = memberAmount.add(cashierCart.getMemberPrice().multiply(BigDecimal.valueOf(cashierCart.getTotalNumber())).add(cashierCart.getPackFee())); }