Authored by mali

Merge branch 'master' into test6.9.10

... ... @@ -94,7 +94,7 @@ public class QuickDeliverGoodsService {
RedisKeyBuilder redisLockKey = RedisKeyBuilder.newInstance()
.appendFixed("ufo:order:lock:publishQuickDeliverGoods:")
.appendVar(req.getUid() + "-" + req.getStorageId());
RedisLock lock = redisLockFactory.newLock(redisLockKey,5,TimeUnit.SECONDS);
RedisLock lock = redisLockFactory.newLock(redisLockKey,10,TimeUnit.SECONDS);
if (lock.tryLock()) {
try {
QuickDeliverOrderContext qdoc = quickDeliverPublishProcessor.buildPublishCtx(req);
... ...