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); }