Accept Merge Request #25: (don -> mark)

Merge Request: 修改库存刷新机制-美团和饿百分时刷新
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/25

business/jxstore/cms/store_sku_check.go

@@ -0,0 +1,341 @@
+package cms
+
+import (
+	"time"
+	"fmt"
+	"sync"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/business/partner/putils"
+	"git.rosy.net.cn/baseapi"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/jxutils/excel"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+const (
+	canWriteTolocal = false
+	parallelCount = 5
+	fileExt = ".xlsx"
+	diffFileName = "export/京西和平台商品差异"
+)
+
+var (
+	vendorNameList = map[int]string {
+		model.VendorIDMTWM: "美团",
+		model.VendorIDEBAI: "饿百",
+		model.VendorIDJD: 	"京东",
+	}
+	titleList = []string {
+		"京西门店ID",
+		"平台门店ID",
+		"门店名",
+		"SkuID",
+		"京西商品名",
+		"平台商品名",
+		"京西可售状态",
+		"平台可售状态",
+	}
+
+	diffData DiffDataLock
+	jdAllSkuInfoMap map[int]*partner.SkuNameInfo
+	jdAllSkuInfoList []*partner.StoreSkuInfo
+)
+
+type DiffDataLock struct {
+	diffDataMap map[int][]DiffData
+	locker sync.RWMutex
+}
+
+type DiffData struct {
+	JxStoreID       string `json:"京西门店ID"`
+	VendorStoreID   string `json:"平台门店ID"`
+	VendorStoreName string `json:"门店名"`
+	SkuID       	string `json:"SkuID"`
+	JxSkuName       string `json:"京西商品名"`
+	VendorSkuName   string `json:"平台商品名"`
+	JxStatus        string `json:"京西可售状态"`
+	VendorStatus    string `json:"平台可售状态"`
+}
+
+func (d *DiffDataLock) AppendData(vendorID int, diffData DiffData) {
+	d.locker.Lock()
+	defer d.locker.Unlock()
+	d.diffDataMap[vendorID] = append(d.diffDataMap[vendorID], diffData)
+}
+
+func (d *DiffDataLock) InitData() {
+	d.diffDataMap = make(map[int][]DiffData)
+}
+
+func GetFilterJxSkuInfoMap(jxSkuInfoList []*StoreSkuNameExt) map[int]*StoreSkuNameExt {
+	filterJxSkuInfoMap := make(map[int]*StoreSkuNameExt)
+	for _, value := range jxSkuInfoList {
+		for _, skuInfo := range value.Skus2 {
+			filterJxSkuInfoMap[skuInfo.SkuID] = value
+		}
+	}
+
+	return filterJxSkuInfoMap
+}
+
+func GetFilterVendorSkuInfoMap(vendorSkuInfoList []*partner.SkuNameInfo) map[int]*partner.SkuNameInfo {
+	filterVendorSkuInfoMap := make(map[int]*partner.SkuNameInfo)
+	for _, value := range vendorSkuInfoList {
+		for _, skuInfo := range value.SkuList {
+			filterVendorSkuInfoMap[skuInfo.SkuID] = value
+		}
+	}
+
+	return filterVendorSkuInfoMap
+}
+
+func GetFilterJdSkuInfoMap(jdSkuInfoList []*partner.StoreSkuInfo) map[int]*partner.StoreSkuInfo {
+	filterJdSkuInfoMap := make(map[int]*partner.StoreSkuInfo)
+	for _, value := range jdSkuInfoList {
+		if value.Stock > 0 {
+			filterJdSkuInfoMap[value.SkuID] = value
+		}
+	}
+
+	return filterJdSkuInfoMap
+}
+
+func GetJdAllSkuInfo() {
+	if _, ok := vendorNameList[model.VendorIDJD]; ok {
+		if jdAllSkuInfoMap == nil {
+			jdAllSkuInfoMap = make(map[int]*partner.SkuNameInfo)
+			ctx := jxcontext.AdminCtx
+			vendorID := model.VendorIDJD
+			if multiHandler, ok := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler); ok {
+				jdAllSkuNameInfoList, err := multiHandler.GetSkus(ctx, 0, "", "")
+				if err != nil {
+					baseapi.SugarLogger.Errorf("GetJdAllSkuInfo error:%v", err)
+				} else {
+					jdAllSkuInfoList = putils.StoreSkuFullList2Bare(jdAllSkuNameInfoList)
+					for _, value := range jdAllSkuNameInfoList {
+						for _, skuInfo := range value.SkuList {
+							jdAllSkuInfoMap[skuInfo.SkuID] = value
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+func GetSkuStatusName(status int) string {
+	if status == model.SkuStatusNormal {
+		return "可售"
+	} else if status == model.SkuStatusDontSale {
+		return "不可售" 
+	} else if status == model.SkuStatusDeleted {
+		return "删除" 
+	}
+
+	return ""
+}
+
+func CompareJxAndJd(vendorID int, storeIDStr, vendorStoreID, storeName string,
+						filterJxSkuInfoMap map[int]*StoreSkuNameExt, 
+						filterJdSkuInfoMap map[int]*partner.StoreSkuInfo) {
+	for skuID, jxSkuInfo := range filterJxSkuInfoMap {		
+		skuIDStr := utils.Int2Str(skuID)				
+		jxSkuDetailName := jxutils.ComposeSkuName(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus2[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus2[0].SkuSpecQuality, jxSkuInfo.Skus2[0].SkuSpecUnit, 0)
+		jxSkuStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus2[0].SkuStatus, jxSkuInfo.Skus2[0].StoreSkuStatus)
+		jxSkuStatusName := GetSkuStatusName(jxSkuStatus)
+		vendorSkuInfo := filterJdSkuInfoMap[skuID]
+		if vendorSkuInfo != nil {
+			vendorSkuInfo := jdAllSkuInfoMap[vendorSkuInfo.SkuID]
+			vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
+			vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status)
+			if jxSkuStatusName != vendorSkuStatusName || jxSkuDetailName != vendorSkuDetailName {
+				outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, vendorSkuDetailName, jxSkuStatusName, vendorSkuStatusName}
+				diffData.AppendData(vendorID, outPutData)
+			}
+		} else {
+			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, "", jxSkuStatusName, ""}
+			diffData.AppendData(vendorID, outPutData)
+		}
+	}
+	for skuID, _ := range filterJdSkuInfoMap {
+		skuIDStr := utils.Int2Str(skuID)
+		vendorSkuInfo := jdAllSkuInfoMap[skuID]
+		vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
+		vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status)
+
+		jxSkuInfo := filterJxSkuInfoMap[skuID]
+		if jxSkuInfo == nil {
+			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", vendorSkuDetailName, "", vendorSkuStatusName}
+			diffData.AppendData(vendorID, outPutData)
+		}
+	}	
+}
+
+func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName string,
+						filterJxSkuInfoMap map[int]*StoreSkuNameExt, 
+						filterVendorSkuInfoMap map[int]*partner.SkuNameInfo) {
+	for skuID, jxSkuInfo := range filterJxSkuInfoMap {		
+		skuIDStr := utils.Int2Str(skuID)				
+		jxSkuDetailName := jxutils.ComposeSkuName(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus2[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus2[0].SkuSpecQuality, jxSkuInfo.Skus2[0].SkuSpecUnit, 0)
+		jxSkuStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus2[0].SkuStatus, jxSkuInfo.Skus2[0].StoreSkuStatus)
+		jxSkuStatusName := GetSkuStatusName(jxSkuStatus)
+
+		vendorSkuInfo := filterVendorSkuInfoMap[skuID]
+		if vendorSkuInfo != nil {
+			vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
+			vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status)
+			if jxSkuStatusName != vendorSkuStatusName || jxSkuDetailName != vendorSkuDetailName {
+				outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, vendorSkuDetailName, jxSkuStatusName, vendorSkuStatusName}
+				diffData.AppendData(vendorID, outPutData)
+			}
+		} else {
+			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, "", jxSkuStatusName, ""}
+			diffData.AppendData(vendorID, outPutData)
+		}
+	}
+	for skuID, vendorSkuInfo := range filterVendorSkuInfoMap {
+		skuIDStr := utils.Int2Str(skuID)
+		vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
+		vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status)
+
+		jxSkuInfo := filterJxSkuInfoMap[skuID]
+		if jxSkuInfo == nil {
+			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", vendorSkuDetailName, "", vendorSkuStatusName}
+			diffData.AppendData(vendorID, outPutData)
+		}
+	}	
+}
+
+func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
+	startProcessTime := time.Now().Unix()
+	vendorMap := make(map[int]bool)
+	for _, vendorID := range vendorIDList {
+		vendorMap[vendorID] = true
+	}
+	storeIDMap := make(map[int]bool)
+	for _, storeID := range storeIDList {
+		storeIDMap[storeID] = true
+	}
+	baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor start time: %v", time.Now())
+	ctx := jxcontext.AdminCtx
+	jxStoreInfoList, err := GetStores(ctx, "", map[string]interface{}{}, 0, -1, utils.DefaultTimeValue, utils.DefaultTimeValue, 0, 0)
+	if err != nil {
+		baseapi.SugarLogger.Errorf("CheckSkuDiffBetweenJxAndVendor GetStores error:%v", err)
+	} else {
+		GetJdAllSkuInfo()
+		diffData.InitData()
+		taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
+			switch step {
+				case 0:
+					taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+						jxStoreInfoListValue := batchItemList[0].(*StoreExt)
+						storeID := jxStoreInfoListValue.ID
+						//filter for storeID
+						if len(storeIDMap) > 0 {
+							if _, ok := storeIDMap[storeID]; !ok {
+								return retVal, err
+							}
+						} 
+						storeIDStr := utils.Int2Str(storeID)
+						storeName := jxStoreInfoListValue.Name
+						if jxStoreInfoListValue.StoreMaps != nil {
+							isGetJxSkuInfoData := false
+							for _, vendorListValue := range jxStoreInfoListValue.StoreMaps {
+								vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"]))
+								//filter for vendorID
+								if len(vendorMap) > 0 {
+									if _, ok := vendorMap[vendorID]; !ok {
+										continue
+									}
+								}
+								if _, ok := vendorNameList[vendorID]; ok {
+									var filterJxSkuInfoMap map[int]*StoreSkuNameExt
+									if isGetJxSkuInfoData == false {//only get once jx sku info list every store id
+										isGetJxSkuInfoData = true
+										jxSkuInfoData, _ := GetStoreSkus(ctx, storeID, []int{}, true, "", true, map[string]interface{}{}, 0, -1)
+										filterJxSkuInfoMap = GetFilterJxSkuInfoMap(jxSkuInfoData.SkuNames)
+									}
+			
+									vendorStoreID := utils.Interface2String(vendorListValue["vendorStoreID"])
+									baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor storeID:%d vendorID:%d vendorStoreID:%s vendorListValue:%v", storeID, vendorID, vendorStoreID, vendorListValue)
+									
+									if vendorID == model.VendorIDJD {
+										singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
+										jdSkuInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, nil, storeID, vendorStoreID, jdAllSkuInfoList)
+										if err != nil {
+											baseapi.SugarLogger.Errorf("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err)
+										} else if len(jdSkuInfoList) > 0 {
+											filterJdSkuInfoMap := GetFilterJdSkuInfoMap(jdSkuInfoList)
+											CompareJxAndJd(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMap, filterJdSkuInfoMap)
+										}
+									} else {
+										singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
+										vendorSkuInfoList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, nil)
+										if err != nil {
+											baseapi.SugarLogger.Errorf("CheckSkuDiffBetweenJxAndVendor GetStoreSkusFullInfo error:%v", err)
+										} else if len(vendorSkuInfoList) > 0 {
+											filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(vendorSkuInfoList)
+											CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMap, filterVendorSkuInfoMap)
+										}
+									}
+								}
+							}
+						}
+						return retVal, err
+					}
+					taskParallel := tasksch.NewParallelTask("CheckSkuDiffBetweenJxAndVendor", tasksch.NewParallelConfig().SetParallelCount(parallelCount), ctx, taskFunc, jxStoreInfoList.Stores)
+					tasksch.HandleTask(taskParallel, task, false).Run()
+					_, err = taskParallel.GetResult(0)
+					if err != nil {
+						baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor taskParallel error:%v", err)
+					}		
+				case 1:
+					WriteToExcel(task, diffData.diffDataMap)
+					endProcessTime := time.Now().Unix()
+					diff := endProcessTime - startProcessTime
+					baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor end time: %v", time.Now())
+					baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor cost time: %d sec", diff)
+			}
+			return result, err
+		}
+		taskSeq := tasksch.NewSeqTask("CheckSkuDiffBetweenJxAndVendor SeqTask", ctx, taskSeqFunc, 2)
+		tasksch.HandleTask(taskSeq, nil, false).Run()
+	}
+}
+
+func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) {
+	var sheetList []*excel.Obj2ExcelSheetConfig
+	for key, value := range data {
+		sheetName := vendorNameList[key]
+		excelConf := &excel.Obj2ExcelSheetConfig{
+			Title:       sheetName,
+			Data:        value,
+			CaptionList: titleList,
+		}
+		sheetList = append(sheetList, excelConf)
+		baseapi.SugarLogger.Debugf("WriteToExcel:append:%s count:%d", sheetName, len(value))
+	}
+	if len(sheetList) > 0 {
+		excelBin := excel.Obj2Excel(sheetList)
+		timeStr := utils.Int64ToStr(time.Now().Unix()) 
+		diffFullFileName := diffFileName + timeStr + fileExt
+		if canWriteTolocal {
+			jxutils.WriteFile(diffFullFileName, excelBin)
+		}
+		baseapi.SugarLogger.Debugf("WriteToExcel:save %s success", diffFullFileName)
+		downloadURL, err := jxutils.UploadExportContent(excelBin, diffFullFileName)
+		if err != nil {
+			baseapi.SugarLogger.Errorf("WriteToExcel:upload %s failed error:%v", diffFullFileName, err)
+		} else {
+			noticeMsg := fmt.Sprintf("[详情点我](%s/billshow/?normal=true&path=%s)  \n", globals.BackstageHost, downloadURL)
+			task.SetNoticeMsg(noticeMsg)
+			baseapi.SugarLogger.Debugf("WriteToExcel:upload %s success, downloadURL:%s", diffFullFileName, downloadURL)
+		}
+	} else {
+		baseapi.SugarLogger.Debug("WriteToExcel:No diff data!!!")
+	}
+}

business/jxstore/cms/store_sku_check_test.go

@@ -0,0 +1,11 @@
+package cms
+
+import (
+	"testing"
+)
+
+func TestCheckSkuDiffBetweenJxAndVendor(t *testing.T) {
+	vendorIDList := []string{}
+	storeIDList := []string{}
+	CheckSkuDiffBetweenJxAndVendor(vendorIDList, storeIDList)
+}

business/jxstore/misc/misc2.go

@@ -2,7 +2,7 @@ package misc
 
 import (
 	"time"
-
+	"strings"
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
@@ -15,32 +15,46 @@ import (
 )
 
 const (
-	specialSkuName              = "温馨提示"
+	taskParallelCount			= 4
+	specialSkuNameKeyWord       = "温馨提示"
 	startOpStoreStockNumber     = 0
 	endOpStoreStockNumber       = model.MaxStoreSkuStockQty
-	startOpStoreTimeDefaultMTWM = int16(2200)
-	endOpStoreTimeDefaultMTWM   = int16(2355)
-	startOpStoreTimeDefaultEBAI = int16(5)
-	endOpStoreTimeDefaultEBAI   = int16(2355)
 )
 
 var (
-	startOpStoreTimeListJXCS = []string{
+	vendorList = map[int]bool {
-		"22:10:00",
-	}
-	endOpStoreTimeListJXCS = []string{
-		"06:10:00",
-	}
-	startOpStoreTimeListJXGY = []string{
-		"22:00:00",
-	}
-	endOpStoreTimeListJXGY = []string{
-		"06:00:00",
-	}
-	vendorList = map[int]bool{
 		model.VendorIDMTWM: true,
 		model.VendorIDEBAI: true,
 	}
+
+	vendorStoreRefreshTimeList = map[int][]string {
+		model.VendorIDMTWM: []string {
+			//start and end time for JXGY
+			"22:00:00",
+			"00:00:00",
+			//start and end time for JXCS
+			"22:10:00",
+			"00:10:00",
+		},
+		model.VendorIDEBAI: []string {
+			"22:20:00",
+			"06:00:00",
+
+			"22:30:00",
+			"06:10:00",
+		},
+	}
+
+	vendorStartEndStoreTime = map[int][]int16 {
+		model.VendorIDMTWM: []int16 {
+			int16(2200),//start time
+			int16(2355),//end time
+		},
+		model.VendorIDEBAI: []int16 {
+			int16(5),
+			int16(2355),
+		},
+	}
 )
 
 func AddOrDelExtraStoreOptime(vendorID, storeID int, vendorStoreID string, storeInfo *model.Store, startOpStoreTime, endOpStoreTime int16, needAddTime bool) bool {
@@ -62,26 +76,50 @@ func GetStockValue(isStart bool) int {
 }
 
 func GetOpStoreTime(vendorID int) (startTime, endTime int16) {
-	if vendorID == model.VendorIDMTWM {
+	startTime = vendorStartEndStoreTime[vendorID][0]
-		return startOpStoreTimeDefaultMTWM, endOpStoreTimeDefaultMTWM
+	endTime = vendorStartEndStoreTime[vendorID][1]
-	} else if vendorID == model.VendorIDEBAI {
+	return startTime, endTime
-		return startOpStoreTimeDefaultEBAI, endOpStoreTimeDefaultEBAI
-	}
-
-	return 0, 0
 }
 
-func FilterSkuNameList(storeSkuNameList []*partner.SkuNameInfo) (filterStoreSkuNameList []*partner.SkuNameInfo) {
+func IsSpecialSku(name string) bool {
+	return strings.Contains(name, specialSkuNameKeyWord)
+}
+
+func SetSkuStock(isStart bool, storeSkuNameList []*partner.SkuNameInfo) {
 	for _, skuNameInfo := range storeSkuNameList {
-		if skuNameInfo.Name != specialSkuName {
+		for _, skuInfo := range skuNameInfo.SkuList {
-			filterStoreSkuNameList = append(filterStoreSkuNameList, skuNameInfo)
+			if IsSpecialSku(skuNameInfo.Name) || IsSpecialSku(skuInfo.SkuName) {
+				skuInfo.Stock = endOpStoreStockNumber
+			} else {
+				skuInfo.Stock = GetStockValue(isStart)
+			}
 		}
 	}
-	return filterStoreSkuNameList
 }
 
-func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContinueWhenError bool) (retVal interface{}, err error) {
+func SetSpecialSkuStatus(storeID, vendorID int, vendorStoreID string, storeSkuNameList []*partner.SkuNameInfo) {
+	ctx := jxcontext.AdminCtx
+	singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
+	for _, skuNameInfo := range storeSkuNameList {
+		for _, skuInfo := range skuNameInfo.SkuList {
+			if IsSpecialSku(skuNameInfo.Name) || IsSpecialSku(skuInfo.SkuName)  {
+				storeSkuList := []*partner.StoreSkuInfo{&skuInfo.StoreSkuInfo}
+				singleStoreHandler.UpdateStoreSkusStatus(ctx, storeID, vendorStoreID, storeSkuList, model.SkuStatusNormal)
+			}
+		}
+	}
+}
+
+func StartOrEndOpStore(isStart bool, vendorIDList []int, storeIDList []int, startTime, endTime int16, isAsync, isContinueWhenError bool) (retVal interface{}, err error) {
 	startProcessTime := time.Now().Unix()
+	vendorMap := make(map[int]bool)
+	for _, vendorID := range vendorIDList {
+		vendorMap[vendorID] = true
+	}
+	storeIDMap := make(map[int]bool)
+	for _, storeID := range storeIDList {
+		storeIDMap[storeID] = true
+	}
 	baseapi.SugarLogger.Debugf("StartOrEndOpStore start time: %v", time.Now())
 	ctx := jxcontext.AdminCtx
 	storeInfo, err := cms.GetStores(ctx, "", map[string]interface{}{}, 0, -1, utils.DefaultTimeValue, utils.DefaultTimeValue, 0, 0)
@@ -92,9 +130,21 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
 		taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			storeListValue := batchItemList[0].(*cms.StoreExt)
 			storeID := storeListValue.ID
+			//filter for storeID
+			if len(storeIDMap) > 0 {
+				if _, ok := storeIDMap[storeID]; !ok {
+					return retVal, err
+				}
+			} 
 			if storeListValue.StoreMaps != nil {
 				for _, vendorListValue := range storeListValue.StoreMaps {
 					vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"]))
+					//filter for vendorID
+					if len(vendorMap) > 0 {
+						if _, ok := vendorMap[vendorID]; !ok {
+							continue
+						}
+					}
 					if _, ok := vendorList[vendorID]; ok {
 						startOpStoreTime, endOpStoreTime := GetOpStoreTime(vendorID)
 						if startTime != 0 && endTime != 0 {
@@ -109,17 +159,15 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
 						if err != nil {
 							baseapi.SugarLogger.Errorf("StartOrEndOpStore GetStoreSkusFullInfo error:%v storeID:%d vendorID:%d vendorStoreID:%s", err, storeID, vendorID, vendorStoreID)
 						} else {
-							filterStoreSkuNameList := FilterSkuNameList(storeSkuNameList)
+							SetSkuStock(isStart, storeSkuNameList)
-							storeSkuList := putils.StoreSkuFullList2Bare(filterStoreSkuNameList)
+							SetSpecialSkuStatus(storeID, vendorID, vendorStoreID, storeSkuNameList)
+							storeSkuList := putils.StoreSkuFullList2Bare(storeSkuNameList)
 							if len(storeSkuList) > 0 {
 								if !isStart {
 									AddOrDelExtraStoreOptime(vendorID, storeID, vendorStoreID, &storeListValue.Store, startOpStoreTime, endOpStoreTime, false)
 								}
 
 								_, err = putils.FreeBatchStoreSkuInfo("更新门店商品库存", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) {
-									for _, skuValue := range batchedStoreSkuList {
-										skuValue.Stock = GetStockValue(isStart)
-									}
 									//var successList []*partner.StoreSkuInfo
 									if _, err = singleStoreHandler.UpdateStoreSkusStock(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil {
 										//successList = batchedStoreSkuList
@@ -138,7 +186,7 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
 			}
 			return retVal, err
 		}
-		task := tasksch.NewParallelTask("StartOrEndOpStore", tasksch.NewParallelConfig().SetParallelCount(4), ctx, taskFunc, storeInfo.Stores)
+		task := tasksch.NewParallelTask("StartOrEndOpStore", tasksch.NewParallelConfig().SetParallelCount(taskParallelCount), ctx, taskFunc, storeInfo.Stores)
 		tasksch.HandleTask(task, nil, true).Run()
 		if isAsync {
 			retVal = task.ID
@@ -158,21 +206,39 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
 	return retVal, err
 }
 
-func InitEx() {
+func GetVendorStoreRefreshTime(vendorID int) (startTimeList, stopTimeList []string) {
-	startTimeList := startOpStoreTimeListJXCS
+	isJXCS := globals.IsMainProductEnv()
-	stopTimeList := endOpStoreTimeListJXCS
+	refreshTimeList := vendorStoreRefreshTimeList[vendorID]
-	if !globals.IsMainProductEnv() {
+	if isJXCS {
-		startTimeList = startOpStoreTimeListJXGY
+		startTimeList = []string{refreshTimeList[2]}
-		stopTimeList = endOpStoreTimeListJXGY
+		stopTimeList = []string{refreshTimeList[3]}
+	} else {
+		startTimeList = []string{refreshTimeList[0]}
+		stopTimeList = []string{refreshTimeList[1]}
 	}
+	return startTimeList, stopTimeList
+}
+
+func RefreshStore(vendorID int) {
+	startTimeList, stopTimeList := GetVendorStoreRefreshTime(vendorID)
+	vendorIDList := []int{vendorID}
+	storeIDList := []int{}
 	ScheduleTimerFunc("StartOpStore", func() {
 		if !IsImportantTaskRunning(TaskNameSyncStoreSku) {
-			StartOrEndOpStore(true, 0, 0, false, true)
+			StartOrEndOpStore(true, vendorIDList, storeIDList, 0, 0, false, true)
 		}
 	}, startTimeList)
 	ScheduleTimerFunc("EndOpStore", func() {
 		if !IsImportantTaskRunning(TaskNameSyncStoreSku) {
-			StartOrEndOpStore(false, 0, 0, false, true)
+			StartOrEndOpStore(false, vendorIDList, storeIDList, 0, 0, false, true)
 		}
 	}, stopTimeList)
 }
+
+func InitEx() {
+	for index, value := range vendorList {
+		if value {
+			RefreshStore(index)
+		}
+	}
+}

business/jxstore/misc/misc2_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func TestStartOrEndOpStore(t *testing.T) {
-	StartOrEndOpStore(true, 0, 0, false, true)
+	StartOrEndOpStore(1, true, 0, 0, false, true)
 }

business/jxutils/jxutils.go

@@ -10,6 +10,7 @@ import (
 	"sort"
 	"strings"
 	"time"
+	"io/ioutil"
 
 	"git.rosy.net.cn/baseapi/platformapi/autonavi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -619,3 +620,8 @@ func GetEbaiOrderGetCode(order *model.GoodsOrder) (getCode string) {
 	}
 	return getCode
 }
+
+func WriteFile(fileName string, binData []byte) error {
+	err := ioutil.WriteFile(fileName, binData, 0666)
+	return err
+}

controllers/temp_op.go

@@ -11,6 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
 	"git.rosy.net.cn/jx-callback/business/jxstore/misc"
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 )
 
 type TempOpController struct {
@@ -275,18 +276,44 @@ func (c *TempOpController) TestIt() {
 
 // @Title 开启或结束所有平台商店的额外时间
 // @Description 开启或结束所有平台商店的额外时间，并且修改所有商品库存为0或99999(开启：0 ， 结束：99999)
-// @Param	token				header	string	true	"认证token"
+// @Param	token				header		string	true	"认证token"
-// @Param	startOrEndStore		query	bool	true	"开启或结束"
+// @Param	vendorIDs			formData	string	false	"运营商ID列表(美团1 饿百3)" 
-// @Param	startTime			query	int		false	"开始营业时间(格式：930代表早上9点30分)"
+// @Param	storeIDs			formData	string	false	"京西门店ID列表"
-// @Param	endTime				query	int		false	"结束营业时间"
+// @Param	startOrEndStore		formData	bool	true	"开启或结束"
-// @Param	isAsync				query	bool	false	"是否异步操作"
+// @Param	startTime			formData	int		false	"开始营业时间(格式：930代表早上9点30分)"
-// @Param	isContinueWhenError	query	bool	false	"单个同步失败是否继续，缺省false"
+// @Param	endTime				formData	int		false	"结束营业时间"
+// @Param	isAsync				formData	bool	false	"是否异步操作"
+// @Param	isContinueWhenError	formData	bool	false	"单个同步失败是否继续，缺省false"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router /TestStartOrEndOpStore [get]
+// @router /TestStartOrEndOpStore [post]
 func (c *TempOpController) TestStartOrEndOpStore() {
 	c.callTestStartOrEndOpStore(func(params *tTempopTestStartOrEndOpStoreParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = misc.StartOrEndOpStore(params.StartOrEndStore, int16(params.StartTime), int16(params.EndTime), params.IsAsync, params.IsContinueWhenError)
+		var vendorIDList []int
+		var storeIDList []int
+		if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDList, params.StoreIDs, &storeIDList); err == nil {
+			retVal, err = misc.StartOrEndOpStore(params.StartOrEndStore, vendorIDList, storeIDList, int16(params.StartTime), int16(params.EndTime), params.IsAsync, params.IsContinueWhenError)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 京西平台和其他平台商品的对比
+// @Description 京西平台和其他平台商品的对比
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorIDs		formData	string	false	"运营商ID列表(京东0 美团1 饿百3)" 
+// @Param	storeIDs		formData	string	false	"京西门店ID列表"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /CheckSkuDiffBetweenJxAndVendor [post]
+func (c *TempOpController) CheckSkuDiffBetweenJxAndVendor() {
+	c.callCheckSkuDiffBetweenJxAndVendor(func(params *tTempopCheckSkuDiffBetweenJxAndVendorParams) (retVal interface{}, errCode string, err error) {
+		var vendorIDList []int
+		var storeIDList []int
+		if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDList, params.StoreIDs, &storeIDList); err == nil {
+			cms.CheckSkuDiffBetweenJxAndVendor(vendorIDList, storeIDList)
+		}
+
 		return retVal, "", err
 	})
 }

routers/commentsRouter_controllers.go

@@ -1654,6 +1654,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"],
+        beego.ControllerComments{
+            Method: "CheckSkuDiffBetweenJxAndVendor",
+            Router: `/CheckSkuDiffBetweenJxAndVendor`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"],
         beego.ControllerComments{
             Method: "PrintMsg",
@@ -1694,7 +1703,7 @@ func init() {
         beego.ControllerComments{
             Method: "TestStartOrEndOpStore",
             Router: `/TestStartOrEndOpStore`,
-            AllowHTTPMethods: []string{"get"},
+            AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})