Commit 3742db33 by 吕明尚

Merge branch 'dev' into test

parents 9831dc4b a059699f
...@@ -345,7 +345,7 @@ public class RedisTask { ...@@ -345,7 +345,7 @@ public class RedisTask {
if (extracted(o, sOrders, sOrder)) return; if (extracted(o, sOrders, sOrder)) return;
//更改订单状态 //更改订单状态
sOrder.setStatus(OrderStatusEnum.USED.getCode()); sOrder.setStatus(OrderStatusEnum.USED.getCode());
addNewConsumer(sOrder); // addNewConsumer(sOrder);
isOrderService.updateById(sOrder); isOrderService.updateById(sOrder);
// 修改房间状态 // 修改房间状态
SRoom room = roomService.getById(sOrder.getRoomId()); SRoom room = roomService.getById(sOrder.getRoomId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment