Authored by mali

Merge branch 'master' into test6.9.10

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