From 58f4668a6ea9747664fbeb0c8eae0a7c3bc5f3e1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 15 Oct 2019 09:34:15 +0800
Subject: [PATCH] up

---
 business/jxstore/misc/misc2.go | 45 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/business/jxstore/misc/misc2.go b/business/jxstore/misc/misc2.go
index b8792e869..ed90d0ca4 100644
--- a/business/jxstore/misc/misc2.go
+++ b/business/jxstore/misc/misc2.go
@@ -1,13 +1,14 @@
 package misc
 
 import (
-	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"time"
 	"strings"
 	"sync"
+	"time"
+
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -17,22 +18,22 @@ import (
 )
 
 const (
-	enableScheduleRefreshStore	= true
-	taskParallelCount			= 4
-	specialSkuNameKeyWord       = "温馨提示"
-	startOpStoreStockNumber     = 0
-	endOpStoreStockNumber       = model.MaxStoreSkuStockQty
+	enableScheduleRefreshStore = true
+	taskParallelCount          = 4
+	specialSkuNameKeyWord      = "温馨提示"
+	startOpStoreStockNumber    = 0
+	endOpStoreStockNumber      = model.MaxStoreSkuStockQty
 )
 
 var (
 	isDaemonRunning = false
-	vendorList = map[int]bool {
+	vendorList      = map[int]bool{
 		model.VendorIDMTWM: true,
 		model.VendorIDEBAI: true,
 	}
-	storeListQueueData = map[bool]*StoreListQueueData {
-		true  : &StoreListQueueData{},
-		false : &StoreListQueueData{},
+	storeListQueueData = map[bool]*StoreListQueueData{
+		true:  &StoreListQueueData{},
+		false: &StoreListQueueData{},
 	}
 	// vendorStoreRefreshTimeList = map[int][]string {
 	// 	model.VendorIDMTWM: []string {
@@ -65,21 +66,22 @@ var (
 )
 
 type StoreListQueueData struct {
-	waitQueue 			[]*cms.StoreExt
-	processQueue 		[]*cms.StoreExt
-	locker      		sync.RWMutex
+	waitQueue    []*cms.StoreExt
+	processQueue []*cms.StoreExt
+	locker       sync.RWMutex
 }
 
-func (s *StoreListQueueData) GetProcessQueue() []*cms.StoreExt {
+func (s *StoreListQueueData) GetProcessQueue() (outQueue []*cms.StoreExt) {
 	s.locker.RLock()
 	defer s.locker.RUnlock()
-	return s.processQueue
+	outQueue = append(outQueue, s.processQueue...)
+	return outQueue
 }
 
 func (s *StoreListQueueData) InsertToWaitQueue(storeInfo *cms.StoreExt) {
 	s.locker.Lock()
 	defer s.locker.Unlock()
-	s.waitQueue = append(s.waitQueue, storeInfo) 
+	s.waitQueue = append(s.waitQueue, storeInfo)
 }
 
 func (s *StoreListQueueData) ClearProcessQueue() {
@@ -144,7 +146,7 @@ func SetSpecialSkuStatus(ctx *jxcontext.Context, storeID, vendorID int, vendorSt
 	singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
 	for _, skuNameInfo := range storeSkuNameList {
 		for _, skuInfo := range skuNameInfo.SkuList {
-			if IsSpecialSku(skuNameInfo.Name) || IsSpecialSku(skuInfo.SkuName)  {
+			if IsSpecialSku(skuNameInfo.Name) || IsSpecialSku(skuInfo.SkuName) {
 				storeSkuList := []*partner.StoreSkuInfo{&skuInfo.StoreSkuInfo}
 				singleStoreHandler.UpdateStoreSkusStatus(ctx, storeID, vendorStoreID, storeSkuList, model.SkuStatusNormal)
 			}
@@ -190,7 +192,7 @@ func GetFilterStoreList(storeList []*cms.StoreExt, vendorMap, storeIDMap map[int
 			}
 			temp := *storeInfo
 			newStoreInfo := &temp
-			newStoreInfo.StoreMaps = []map[string]interface{} {vendorStoreInfo}
+			newStoreInfo.StoreMaps = []map[string]interface{}{vendorStoreInfo}
 			outStoreList = append(outStoreList, newStoreInfo)
 		}
 	}
@@ -293,6 +295,7 @@ func StartOrEndOpStoreEx(ctx *jxcontext.Context, isStart bool, startTime, endTim
 func IsJXCS() bool {
 	return globals.IsMainProductEnv()
 }
+
 // func GetVendorStoreRefreshTime(vendorID int) (startTimeList, stopTimeList []string) {
 // 	isJXCS := globals.IsMainProductEnv()
 // 	refreshTimeList := vendorStoreRefreshTimeList[vendorID]
@@ -374,7 +377,7 @@ func InitEx() {
 								value.TransferWaitQueueToProcessQueue()
 							}
 						}
-						PeriodlyCall(time.Second, periodlyFunc)					
+						PeriodlyCall(60*time.Second, periodlyFunc)
 					}
 					return result, err
 				}
@@ -390,4 +393,4 @@ func PeriodlyCall(d time.Duration, handler func()) {
 	for _ = range ticker.C {
 		handler()
 	}
-}
\ No newline at end of file
+}