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