czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

创建订单修改餐位费校验

Browse Source
This commit is contained in:
SongZhang
2024-10-24 09:31:35 +08:00
parent b2f01ed453
commit 4cdc0b5738
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1151,14 +1151,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
List<TbOrderDetail> addOrderDetails = new ArrayList<>(); List<TbOrderDetail> addOrderDetails = new ArrayList<>();
BigDecimal mealAmount = null;
Integer mealNum = null;
boolean hasNewInfo = false; boolean hasNewInfo = false;
for (TbCashierCart cashierCart : cashierCarts) { for (TbCashierCart cashierCart : cashierCarts) {
if ("-999".equals(cashierCart.getProductId())) {
mealAmount = cashierCart.getTotalAmount();
mealNum = cashierCart.getNumber();
}
if (!"return".equals(cashierCart.getStatus())) { if (!"return".equals(cashierCart.getStatus())) {
totalAmount = totalAmount.add(cashierCart.getTotalAmount()); totalAmount = totalAmount.add(cashierCart.getTotalAmount());
packAMount = packAMount.add(cashierCart.getPackFee()); packAMount = packAMount.add(cashierCart.getPackFee());
@@ -1203,11 +1198,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetails.add(orderDetail); orderDetails.add(orderDetail);
} }
if (shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
&& !shopEatTypeInfoDTO.isTakeout()
&& mealAmount == null) {
throw new BadRequestException("请选择用餐人数");
}
// 查询订单 // 查询订单
TbOrderInfo orderInfo = null; TbOrderInfo orderInfo = null;
@@ -1232,8 +1222,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo.setTradeDay(DateUtils.getDay()); orderInfo.setTradeDay(DateUtils.getDay());
orderInfo.setUseType(createOrderDTO.getUseType()); orderInfo.setUseType(createOrderDTO.getUseType());
orderInfo.setCreatedAt(DateUtil.current()); orderInfo.setCreatedAt(DateUtil.current());
orderInfo.setSeatAmount(mealAmount); if (seatCart != null) {
orderInfo.setSeatCount(mealNum); orderInfo.setSeatAmount(seatCart.getTotalAmount());
orderInfo.setSeatCount(seatCart.getNumber());
}
if (StrUtil.isNotBlank(createOrderDTO.getVipUserId())) { if (StrUtil.isNotBlank(createOrderDTO.getVipUserId())) {
orderInfo.setUserId(createOrderDTO.getVipUserId()); orderInfo.setUserId(createOrderDTO.getVipUserId());
} }
@@ -1272,8 +1264,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (StrUtil.isNotBlank(createOrderDTO.getVipUserId())) { if (StrUtil.isNotBlank(createOrderDTO.getVipUserId())) {
orderInfo.setUserId(createOrderDTO.getVipUserId()); orderInfo.setUserId(createOrderDTO.getVipUserId());
} }
orderInfo.setSeatAmount(mealAmount); if (seatCart != null) {
orderInfo.setSeatCount(mealNum); orderInfo.setSeatAmount(seatCart.getTotalAmount());
orderInfo.setSeatCount(seatCart.getNumber());
}
orderInfo.setSendType(shopEatTypeInfoDTO.getSendType()); orderInfo.setSendType(shopEatTypeInfoDTO.getSendType());
TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>() TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
.eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId()) .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
@@ -1371,7 +1365,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.set(TbShopTable::getProductNum, cashierCarts.size()) .set(TbShopTable::getProductNum, cashierCarts.size())
.set(TbShopTable::getTotalAmount, orderInfo.getOrderAmount()) .set(TbShopTable::getTotalAmount, orderInfo.getOrderAmount())
.set(TbShopTable::getRealAmount, orderInfo.getOrderAmount()) .set(TbShopTable::getRealAmount, orderInfo.getOrderAmount())
.set(TbShopTable::getUseNum, mealNum) .set(TbShopTable::getUseNum, seatCart != null ? seatCart.getNumber() : null)
.set(TbShopTable::getStatus, TableStateEnum.USING.getState()); .set(TbShopTable::getStatus, TableStateEnum.USING.getState());
if (isFirst) { if (isFirst) {
wrapper.set(TbShopTable::getUseTime, DateUtil.date()); wrapper.set(TbShopTable::getUseTime, DateUtil.date());