From 7d86bc5c28d1c988d6f12bf7e7c1685c467d849f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 7 Nov 2024 09:47:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E5=B0=B1=E9=A4=90?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=BF=94=E5=9B=9E=E7=9A=84=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=AB=E5=AE=A2=E5=BA=A7=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/controller/ProductController.java | 8 ++++++-- 1 file changed, 6 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 ab5edb7..151cc76 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java @@ -123,17 +123,21 @@ public class ProductController { BigDecimal amount = BigDecimal.ZERO; BigDecimal memberAmount = BigDecimal.ZERO; ArrayList cashierCarts = new ArrayList<>(); + TbCashierCart seatFee = null; for (TbCashierCart item : cashierCartList) { if (!TableConstant.CART_SEAT_ID.equals(item.getProductId())) { cashierCarts.add(item); + 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())); + }else { + seatFee = item; } - 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", memberAmount); data.put("info", cashierCarts); + data.put("seatFee", seatFee); return Result.success(CodeEnum.SUCCESS, data); }