|
@@ -1045,13 +1045,14 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
|
|
|
throw new SqxException("扫码无效的跑腿订单id");
|
|
throw new SqxException("扫码无效的跑腿订单id");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 如果是外卖订单
|
|
|
|
|
+ if (ObjectUtil.equal(indentOrder.getIndentType(), "5")) {
|
|
|
|
|
+ orderHandTakeoutOrder(indentOrder, userId, orderDeliveryDTO);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
RLock lock = redissonClient.getLock(String.format(RedisKey.UPDATE_INDENT_LOCK, indentOrder.getIndentNumber()));
|
|
RLock lock = redissonClient.getLock(String.format(RedisKey.UPDATE_INDENT_LOCK, indentOrder.getIndentNumber()));
|
|
|
lock.lock();
|
|
lock.lock();
|
|
|
try {
|
|
try {
|
|
|
- // 如果是外卖订单
|
|
|
|
|
- if (ObjectUtil.equal(indentOrder.getIndentType(), "5")) {
|
|
|
|
|
- orderHandTakeoutOrder(indentOrder, userId, orderDeliveryDTO);
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
return orderFinshOrder(userId, indentOrder.getIndentNumber());
|
|
return orderFinshOrder(userId, indentOrder.getIndentNumber());
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|