From f20c679dc8ad0f4b1c28d276dee000a865825a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 11 Nov 2024 14:22:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=B4=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/ProductController.java | 3 +++ 1 file changed, 3 insertions(+) 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 397d3cd..d16b8d8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java @@ -123,6 +123,7 @@ public class ProductController { List cashierCartList = cartService.choseEatModel(choseEatModelDTO); BigDecimal amount = BigDecimal.ZERO; BigDecimal memberAmount = BigDecimal.ZERO; + BigDecimal packFee = BigDecimal.ZERO; ArrayList cashierCarts = new ArrayList<>(); TbCashierCart seatFee = null; for (TbCashierCart item : cashierCartList) { @@ -133,12 +134,14 @@ public class ProductController { }else { seatFee = item; } + packFee = packFee.add(item.getPackFee()); } HashMap data = new HashMap<>(); data.put("amount", amount); data.put("memberAmount", memberAmount); data.put("info", cashierCarts); data.put("seatFee", seatFee); + data.put("packFee", seatFee); return Result.success(CodeEnum.SUCCESS, data); }