diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 037eadee..6b55210f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1205,7 +1205,6 @@ public class TbShopTableServiceImpl implements TbShopTableService { String orderNo = generateOrderNumber(null); orderInfo = new TbOrderInfo(); orderInfo.setOrderNo(orderNo); - orderInfo.setUseType(createOrderDTO.isPostPay() ? "postPay" : "afterPay"); orderInfo.setAmount(totalAmount); orderInfo.setPayAmount(BigDecimal.ZERO); orderInfo.setPackFee(packAMount); @@ -1286,6 +1285,11 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (cashierCart.getPlaceNum() == null) { cashierCart.setPlaceNum(placeNum); } + + // 先付费模式,结束购物车状态 + if (shopEatTypeInfoDTO.isDineInBefore()) { + cashierCart.setStatus("final"); + } cashierCartMapper.updateById(cashierCart); }