fix: 切换就餐模式返回的价格不包含客座费
This commit is contained in:
@@ -123,17 +123,21 @@ public class ProductController {
|
||||
BigDecimal amount = BigDecimal.ZERO;
|
||||
BigDecimal memberAmount = BigDecimal.ZERO;
|
||||
ArrayList<TbCashierCart> 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<String, Object> 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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user