Merge branch 'dev' into pre

internal/biz/vo/cache.go

@@ -36,7 +36,7 @@ var CacheKeyMap = map[CacheKey]time.Duration{
 	CmbProductQueryLockKey:              30 * time.Second,
 	CmbBatchNoticeCacheKey:              21600 * time.Second, // 6小时
 	CmbBatchNoticeLockKey:               300 * time.Second,
-	OrderConsumeFailAlarmKey:            2 * time.Hour, // 2小时
+	OrderConsumeFailAlarmKey:            5 * time.Hour, // 5小时
 	OrderConsumeFailAlarmLockKey:        60 * time.Second,
 	NotifyRetryConsume:                  60 * time.Second,
 	WechatNotifyRegisterTagCacheKey:     30 * 86400 * time.Second, // 30天