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-09-28 09:41:17 +08:00
parent 492fa159b9
commit 70291911a6
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1284,6 +1284,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
} }
if (!shopEatTypeInfoDTO.isTakeout()) {
LambdaUpdateWrapper<TbShopTable> wrapper = new LambdaUpdateWrapper<TbShopTable>() LambdaUpdateWrapper<TbShopTable> wrapper = new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getShopId, createOrderDTO.getShopId()) .eq(TbShopTable::getShopId, createOrderDTO.getShopId())
.eq(TbShopTable::getQrcode, createOrderDTO.getTableId()) .eq(TbShopTable::getQrcode, createOrderDTO.getTableId())
@@ -1297,6 +1298,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
// 设置台桌信息 // 设置台桌信息
mpShopTableMapper.update(null, wrapper); mpShopTableMapper.update(null, wrapper);
}
String tableCartKey = RedisConstant.getTableCartKey(createOrderDTO.getTableId(), createOrderDTO.getShopId().toString()); String tableCartKey = RedisConstant.getTableCartKey(createOrderDTO.getTableId(), createOrderDTO.getShopId().toString());
redisTemplate.delete(tableCartKey); redisTemplate.delete(tableCartKey);
@@ -1461,6 +1464,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
throw new BadRequestException("未知支付方式"); throw new BadRequestException("未知支付方式");
} }
TbOrderInfo orderInfo = orderInfoMapper.selectById(payDTO.getOrderId()); TbOrderInfo orderInfo = orderInfoMapper.selectById(payDTO.getOrderId());
if (ObjectUtil.isEmpty(orderInfo)) { if (ObjectUtil.isEmpty(orderInfo)) {
@@ -1471,6 +1475,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
throw new BadRequestException("订单非未支付状态"); throw new BadRequestException("订单非未支付状态");
} }
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(payDTO.getShopId(), orderInfo.getTableId());
if (payDTO.getDiscount() == null) { if (payDTO.getDiscount() == null) {
payDTO.setDiscount((double) 1); payDTO.setDiscount((double) 1);
} }
@@ -1534,6 +1540,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
rabbitTemplate.convertAndSend(RabbitConstants.EXCHANGE_STOCK_RECORD, RabbitConstants.ROUTING_STOCK_RECORD_SALE, mqData.toJSONString(), new CorrelationData(UUID.randomUUID().toString())); rabbitTemplate.convertAndSend(RabbitConstants.EXCHANGE_STOCK_RECORD, RabbitConstants.ROUTING_STOCK_RECORD_SALE, mqData.toJSONString(), new CorrelationData(UUID.randomUUID().toString()));
// 修改台桌状态 // 修改台桌状态
if (!shopEatTypeInfoDTO.isTakeout()) {
TbShopTable tbShopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>() TbShopTable tbShopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()
.eq(TbShopTable::getShopId, payDTO.getShopId()) .eq(TbShopTable::getShopId, payDTO.getShopId())
.eq(TbShopTable::getQrcode, orderInfo.getTableId())); .eq(TbShopTable::getQrcode, orderInfo.getTableId()));
@@ -1549,8 +1556,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.set(TbShopTable::getEndTime, DateUtil.date()) .set(TbShopTable::getEndTime, DateUtil.date())
.set(TbShopTable::getStatus, TableStateEnum.CLEANING.getState())); .set(TbShopTable::getStatus, TableStateEnum.CLEANING.getState()));
} }
}
if ("postPay".equals(orderInfo.getUseType())) {
if (!shopEatTypeInfoDTO.isTakeout()) {
String day = DateUtils.getDay(); String day = DateUtils.getDay();
String key = "SHOP:CODE:USER:pc" + ":" + payDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId(); String key = "SHOP:CODE:USER:pc" + ":" + payDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
redisTemplate.delete(key); redisTemplate.delete(key);