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-23 10:57:17 +08:00
parent d253b6d8fb
commit 165e1fde14
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1106,6 +1106,7 @@ public class CartService {
if (orderDetail == null) { if (orderDetail == null) {
orderDetail = new TbOrderDetail(); orderDetail = new TbOrderDetail();
orderDetail.setStatus(TableConstant.CashierCart.Status.RETURN.equalsVals(cashierCart.getStatus()) ? cashierCart.getStatus() : "unpaid");
priceDTO.setHasNewInfo(true); priceDTO.setHasNewInfo(true);
priceDTO.getNewOrderDetailList().add(orderDetail); priceDTO.getNewOrderDetailList().add(orderDetail);
} }
@@ -1195,6 +1196,7 @@ public class CartService {
balanceCart.setTotalNumber(balanceNum); balanceCart.setTotalNumber(balanceNum);
balanceCart.setPackFee(singlePackFee.multiply(num)); balanceCart.setPackFee(singlePackFee.multiply(num));
balanceCart.setTotalAmount(cashierCart.getSalePrice().multiply(num).add(balanceCart.getPackFee())); balanceCart.setTotalAmount(cashierCart.getSalePrice().multiply(num).add(balanceCart.getPackFee()));
balanceCart.resetTotalAmount();
balanceCartList.add(balanceCart); balanceCartList.add(balanceCart);
} else { } else {
currentUseNum = BigDecimal.valueOf(cashierCart.getNumber()); currentUseNum = BigDecimal.valueOf(cashierCart.getNumber());
@@ -1297,6 +1299,8 @@ public class CartService {
TbCashierCart seatInfo = null; TbCashierCart seatInfo = null;
Integer orderId = null; Integer orderId = null;
for (TbCashierCart tbCashierCart : allCartList) { for (TbCashierCart tbCashierCart : allCartList) {
tbCashierCart.setUserCouponId(null);
tbCashierCart.setUseCouponInfo(null);
tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
cashierIds.add(tbCashierCart.getId()); cashierIds.add(tbCashierCart.getId());
// 设置会员信息及价格 // 设置会员信息及价格
@@ -1433,8 +1437,6 @@ public class CartService {
// 获取台桌信息 // 获取台桌信息
TbShopTable shopTable = getTableInfoByEatType(shopEatTypeInfoDTO); TbShopTable shopTable = getTableInfoByEatType(shopEatTypeInfoDTO);
// 获取订单信息 // 获取订单信息
TbOrderInfo orderInfo = null; TbOrderInfo orderInfo = null;
OrderCartInfoDTO cartInfoDTO = null; OrderCartInfoDTO cartInfoDTO = null;