Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of…

Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderQueueService.java

order-application-service/src/main/java/cn/freemud/service/impl/OrderQueueService.java

@@ -85,7 +85,7 @@ public class OrderQueueService {
 
         String redisKey = RedisKeyConstant.KGD_PAYMENT_CANCEL_OID + oid ;
         //取消支付订单缓存
-//        redisCache.save(redisKey, true, 180L, TimeUnit.MINUTES);
+        redisCache.save(redisKey, true, 120L, TimeUnit.MINUTES);
     }