czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 切换就餐模式返回的价格不包含客座费

Browse Source
This commit is contained in:
张松
2024-11-07 09:47:46 +08:00
parent e92e0c3c62
commit 7d86bc5c28
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java
View File

@@ -123,17 +123,21 @@ public class ProductController {
BigDecimal amount = BigDecimal.ZERO; BigDecimal amount = BigDecimal.ZERO;
BigDecimal memberAmount = BigDecimal.ZERO; BigDecimal memberAmount = BigDecimal.ZERO;
ArrayList<TbCashierCart> cashierCarts = new ArrayList<>(); ArrayList<TbCashierCart> cashierCarts = new ArrayList<>();
TbCashierCart seatFee = null;
for (TbCashierCart item : cashierCartList) { for (TbCashierCart item : cashierCartList) {
if (!TableConstant.CART_SEAT_ID.equals(item.getProductId())) { if (!TableConstant.CART_SEAT_ID.equals(item.getProductId())) {
cashierCarts.add(item); 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<String, Object> data = new HashMap<>(); HashMap<String, Object> data = new HashMap<>();
data.put("amount", amount); data.put("amount", amount);
data.put("memberAmount", memberAmount); data.put("memberAmount", memberAmount);
data.put("info", cashierCarts); data.put("info", cashierCarts);
data.put("seatFee", seatFee);
return Result.success(CodeEnum.SUCCESS, data); return Result.success(CodeEnum.SUCCESS, data);
} }