Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
Tankaikai
2024-09-27 17:33:45 +08:00

View File

@@ -1301,7 +1301,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
redisTemplate.delete(tableCartKey);
return orderInfo;
}, stringRedisTemplate, RedisConstant.getLockKey(RedisConstant.CREATE_ORDER, createOrderDTO.getShopId(),
createOrderDTO.getTableId(), createOrderDTO.getMasterId(), createOrderDTO.isPostPay()));
createOrderDTO.getTableId(), createOrderDTO.getMasterId(), createOrderDTO.getUseType()));
}