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

Merge Request: 重构京西和平台商品对比的代码
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/26

business/jxstore/cms/store_sku_check.go

@@ -1,18 +1,20 @@
 package cms
 
 import (
-	"time"
 	"fmt"
+	"strings"
 	"sync"
+	"time"
+
+	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/excel"
 	"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"
 	"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"
 )
 
@@ -24,12 +26,12 @@ const (
 )
 
 var (
-	vendorNameList = map[int]string {
+	vendorNameList = map[int]string{
-		model.VendorIDMTWM: "美团",
+		model.VendorIDMTWM: model.VendorChineseNames[model.VendorIDMTWM],
-		model.VendorIDEBAI: "饿百",
+		model.VendorIDEBAI: model.VendorChineseNames[model.VendorIDEBAI],
-		model.VendorIDJD: 	"京东",
+		model.VendorIDJD:   model.VendorChineseNames[model.VendorIDJD],
 	}
-	titleList = []string {
+	titleList = []string{
 		"京西门店ID",
 		"平台门店ID",
 		"门店名",
@@ -41,8 +43,9 @@ var (
 	}
 
 	diffData         DiffDataLock
-	jdAllSkuInfoMap map[int]*partner.SkuNameInfo
+
-	jdAllSkuInfoList []*partner.StoreSkuInfo
+	multiStoreAllSkuInfoMap  map[int]map[int]*partner.SkuNameInfo
+	multiStoreAllSkuInfoList map[int][]*partner.StoreSkuInfo
 )
 
 type DiffDataLock struct {
@@ -71,6 +74,50 @@ func (d *DiffDataLock) InitData() {
 	d.diffDataMap = make(map[int][]DiffData)
 }
 
+func IsMultiStore(vendorID int) bool {
+	if _, ok := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler); ok {
+		return true
+	}
+
+	return false
+}
+
+func InitMultiStoreData() {
+	multiStoreAllSkuInfoMap = make(map[int]map[int]*partner.SkuNameInfo)
+	multiStoreAllSkuInfoList = make(map[int][]*partner.StoreSkuInfo)
+}
+
+func GetMultiStoreAllSkuInfoMap(vendorID int) map[int]*partner.SkuNameInfo {
+	return multiStoreAllSkuInfoMap[vendorID]
+}
+
+func GetMultiStoreAllSkuInfoList(vendorID int) []*partner.StoreSkuInfo {
+	return multiStoreAllSkuInfoList[vendorID]
+}
+
+func GetMultiStoreAllSkuInfo() {
+	InitMultiStoreData()
+	ctx := jxcontext.AdminCtx
+	for vendorID, _ := range vendorNameList {
+		if IsMultiStore(vendorID) {
+			multiHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler)
+			allSkuNameInfoList, err := multiHandler.GetSkus(ctx, 0, "", "")
+			if err != nil {
+				baseapi.SugarLogger.Errorf("GetMultiStoreAllSkuInfo error:%v", err)
+			} else {
+				multiStoreAllSkuInfoList[vendorID] = putils.StoreSkuFullList2Bare(allSkuNameInfoList)
+				tempMap := make(map[int]*partner.SkuNameInfo)
+				for _, value := range allSkuNameInfoList {
+					for _, skuInfo := range value.SkuList {
+						tempMap[skuInfo.SkuID] = value
+					}
+				}
+				multiStoreAllSkuInfoMap[vendorID] = tempMap
+			}
+		}
+	}
+}
+
 func GetFilterJxSkuInfoMap(jxSkuInfoList []*StoreSkuNameExt) map[int]*StoreSkuNameExt {
 	filterJxSkuInfoMap := make(map[int]*StoreSkuNameExt)
 	for _, value := range jxSkuInfoList {
@@ -93,91 +140,23 @@ func GetFilterVendorSkuInfoMap(vendorSkuInfoList []*partner.SkuNameInfo) map[int
 	return filterVendorSkuInfoMap
 }
 
-func GetFilterJdSkuInfoMap(jdSkuInfoList []*partner.StoreSkuInfo) map[int]*partner.StoreSkuInfo {
+func GetFilterMultiStoreSkuInfoMap(vendorID int, skuInfoList []*partner.StoreSkuInfo) map[int]*partner.SkuNameInfo {
-	filterJdSkuInfoMap := make(map[int]*partner.StoreSkuInfo)
+	allSkuInfoMap := GetMultiStoreAllSkuInfoMap(vendorID)
-	for _, value := range jdSkuInfoList {
+	filterSkuInfoMap := make(map[int]*partner.SkuNameInfo)
+	for _, value := range skuInfoList {
 		if value.Stock > 0 {
-			filterJdSkuInfoMap[value.SkuID] = value
+			filterSkuInfoMap[value.SkuID] = allSkuInfoMap[value.SkuID]
 		}
 	}
 
-	return filterJdSkuInfoMap
+	return filterSkuInfoMap
-}
-
-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 model.SkuStatusName[status]
-		return "可售"
-	} else if status == model.SkuStatusDontSale {
-		return "不可售" 
-	} else if status == model.SkuStatusDeleted {
-		return "删除" 
-	}
-
-	return ""
 }
 
-func CompareJxAndJd(vendorID int, storeIDStr, vendorStoreID, storeName string,
+func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName string, filterJxSkuInfoMap map[int]*StoreSkuNameExt, filterVendorSkuInfoMap map[int]*partner.SkuNameInfo) {
-						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)
@@ -188,7 +167,13 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
 		if vendorSkuInfo != nil {
 			vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
 			vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status)
-			if jxSkuStatusName != vendorSkuStatusName || jxSkuDetailName != vendorSkuDetailName {
+
+			isStatusDiff := jxSkuStatusName != vendorSkuStatusName
+			isNameDiff := jxSkuDetailName != vendorSkuDetailName
+			if jxSkuDetailName != "" && vendorSkuDetailName != "" && strings.Contains(jxSkuDetailName, vendorSkuDetailName) {
+				isNameDiff = false
+			}			
+			if isStatusDiff || isNameDiff {
 				outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, vendorSkuDetailName, jxSkuStatusName, vendorSkuStatusName}
 				diffData.AppendData(vendorID, outPutData)
 			}
@@ -212,6 +197,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
 
 func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 	startProcessTime := time.Now().Unix()
+	baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor start time: %v", time.Now())
 	vendorMap := make(map[int]bool)
 	for _, vendorID := range vendorIDList {
 		vendorMap[vendorID] = true
@@ -220,17 +206,16 @@ func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 	for _, storeID := range storeIDList {
 		storeIDMap[storeID] = true
 	}
-	baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor start time: %v", time.Now())
 	ctx := jxcontext.AdminCtx
+	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
+		switch step {
+		case 0:
 			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()
+				GetMultiStoreAllSkuInfo()
 				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
@@ -244,6 +229,7 @@ func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 					storeName := jxStoreInfoListValue.Name
 					if jxStoreInfoListValue.StoreMaps != nil {
 						isGetJxSkuInfoData := false
+						var filterJxSkuInfoMap map[int]*StoreSkuNameExt
 						for _, vendorListValue := range jxStoreInfoListValue.StoreMaps {
 							vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"]))
 							//filter for vendorID
@@ -253,8 +239,7 @@ func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 								}
 							}
 							if _, ok := vendorNameList[vendorID]; ok {	
-									var filterJxSkuInfoMap map[int]*StoreSkuNameExt
+								if isGetJxSkuInfoData == false { //only get once jx sku info list every store id
-									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)
@@ -263,14 +248,15 @@ func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 								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 {
+								if IsMultiStore(vendorID) {
 									singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
-										jdSkuInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, nil, storeID, vendorStoreID, jdAllSkuInfoList)
+									allSkuInfoList := GetMultiStoreAllSkuInfoList(vendorID)
+									skuBareInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, nil, storeID, vendorStoreID, allSkuInfoList)
 									if err != nil {
 										baseapi.SugarLogger.Errorf("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err)
-										} else if len(jdSkuInfoList) > 0 {
+									} else if len(skuBareInfoList) > 0 {
-											filterJdSkuInfoMap := GetFilterJdSkuInfoMap(jdSkuInfoList)
+										filterSkuInfoMap := GetFilterMultiStoreSkuInfoMap(vendorID, skuBareInfoList)
-											CompareJxAndJd(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMap, filterJdSkuInfoMap)
+										CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMap, filterSkuInfoMap)
 									}
 								} else {
 									singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
@@ -288,11 +274,12 @@ func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 					return retVal, err
 				}
 				taskParallel := tasksch.NewParallelTask("CheckSkuDiffBetweenJxAndVendor", tasksch.NewParallelConfig().SetParallelCount(parallelCount), ctx, taskFunc, jxStoreInfoList.Stores)
-					tasksch.HandleTask(taskParallel, task, false).Run()
+				tasksch.HandleTask(taskParallel, task, true).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()
@@ -303,8 +290,7 @@ func CheckSkuDiffBetweenJxAndVendor(vendorIDList []int, storeIDList []int) {
 		return result, err
 	}
 	taskSeq := tasksch.NewSeqTask("CheckSkuDiffBetweenJxAndVendor SeqTask", ctx, taskSeqFunc, 2)
-		tasksch.HandleTask(taskSeq, nil, false).Run()
+	tasksch.HandleTask(taskSeq, nil, true).Run()
-	}
 }
 
 func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) {