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-06 15:45:36 +08:00
parent d1ca5179f9
commit 72b6780339
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,15 +121,18 @@ public class ProductController {
public Result choseEatModel(@Validated @RequestBody ChoseEatModelDTO choseEatModelDTO) { public Result choseEatModel(@Validated @RequestBody ChoseEatModelDTO choseEatModelDTO) {
List<TbCashierCart> cashierCartList = cartService.choseEatModel(choseEatModelDTO); List<TbCashierCart> cashierCartList = cartService.choseEatModel(choseEatModelDTO);
BigDecimal amount = BigDecimal.ZERO; BigDecimal amount = BigDecimal.ZERO;
BigDecimal memberAmount = BigDecimal.ZERO;
ArrayList<TbCashierCart> cashierCarts = new ArrayList<>(); ArrayList<TbCashierCart> cashierCarts = new ArrayList<>();
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.getTotalAmount()); 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", amount);
data.put("info", cashierCarts); data.put("info", cashierCarts);
return Result.success(CodeEnum.SUCCESS, data); return Result.success(CodeEnum.SUCCESS, data);
} }

2
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -192,7 +192,7 @@ public class CartService {
array.add(cashierCart); array.add(cashierCart);
} }
if (cashierCart.getIsVip().equals((byte) 1)) continue; if (cashierCart.getIsVip().equals((byte) 1)) continue;
if (!ignoreTableFee && cashierCart.getNumber() > 0) { if ((!ignoreTableFee || !TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) && cashierCart.getNumber() > 0) {
amount = amount.add(cashierCart.getSalePrice().multiply(BigDecimal.valueOf(cashierCart.getTotalNumber())).add(cashierCart.getPackFee())); amount = amount.add(cashierCart.getSalePrice().multiply(BigDecimal.valueOf(cashierCart.getTotalNumber())).add(cashierCart.getPackFee()));
memberAmount = memberAmount.add(cashierCart.getMemberPrice().multiply(BigDecimal.valueOf(cashierCart.getTotalNumber())).add(cashierCart.getPackFee())); memberAmount = memberAmount.add(cashierCart.getMemberPrice().multiply(BigDecimal.valueOf(cashierCart.getTotalNumber())).add(cashierCart.getPackFee()));
} }