liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark

Browse Source
This commit is contained in:
gazebo
2019-08-09 18:18:19 +08:00
parent 1111a70277 2b530faaf6
commit 64a4ceda62
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jxstore/cms/store_sku_check.go
View File

@@ -39,6 +39,7 @@ var (
"平台门店ID", "平台门店ID",
"门店名", "门店名",
"SkuID", "SkuID",
"同步状态",
"京西商品名", "京西商品名",
"平台商品名", "平台商品名",
"京西可售状态", "京西可售状态",
@@ -61,6 +62,7 @@ type DiffData struct {
VendorStoreID string `json:"平台门店ID"` VendorStoreID string `json:"平台门店ID"`
VendorStoreName string `json:"门店名"` VendorStoreName string `json:"门店名"`
SkuID string `json:"SkuID"` SkuID string `json:"SkuID"`
SyncStatus string `json:"同步状态"`
JxSkuName string `json:"京西商品名"` JxSkuName string `json:"京西商品名"`
VendorSkuName string `json:"平台商品名"` VendorSkuName string `json:"平台商品名"`
JxStatus string `json:"京西可售状态"` JxStatus string `json:"京西可售状态"`
@@ -166,6 +168,14 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
jxSkuStatusName := GetSkuStatusName(jxSkuStatus) jxSkuStatusName := GetSkuStatusName(jxSkuStatus)
vendorSkuInfo := filterVendorSkuInfoMap[skuID] vendorSkuInfo := filterVendorSkuInfoMap[skuID]
syncStatus := ""
if vendorID == model.VendorIDMTWM {
syncStatus = utils.Int2Str(int(jxSkuInfo.Skus2[0].MtwmSyncStatus))
} else if vendorID == model.VendorIDEBAI {
syncStatus = utils.Int2Str(int(jxSkuInfo.Skus2[0].EbaiSyncStatus))
} else if vendorID == model.VendorIDJD {
syncStatus = utils.Int2Str(int(jxSkuInfo.Skus2[0].JdSyncStatus))
}
if vendorSkuInfo != nil { if vendorSkuInfo != nil {
vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status) vendorSkuStatusName := GetSkuStatusName(vendorSkuInfo.SkuList[0].Status)
@@ -176,11 +186,11 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
isNameDiff = false isNameDiff = false
} }
if isStatusDiff || isNameDiff { if isStatusDiff || isNameDiff {
outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, vendorSkuDetailName, jxSkuStatusName, vendorSkuStatusName} outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, jxSkuDetailName, vendorSkuDetailName, jxSkuStatusName, vendorSkuStatusName}
diffData.AppendData(vendorID, outPutData) diffData.AppendData(vendorID, outPutData)
} }
} else { } else {
outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, jxSkuDetailName, "", jxSkuStatusName, ""} outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, jxSkuDetailName, "", jxSkuStatusName, ""}
diffData.AppendData(vendorID, outPutData) diffData.AppendData(vendorID, outPutData)
} }
} }
@@ -191,7 +201,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
jxSkuInfo := filterJxSkuInfoMap[skuID] jxSkuInfo := filterJxSkuInfoMap[skuID]
if jxSkuInfo == nil { if jxSkuInfo == nil {
outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", vendorSkuDetailName, "", vendorSkuStatusName} outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", "", vendorSkuDetailName, "", vendorSkuStatusName}
diffData.AppendData(vendorID, outPutData) diffData.AppendData(vendorID, outPutData)
} }
} }
@@ -233,6 +243,10 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
var filterJxSkuInfoMap map[int]*StoreSkuNameExt var filterJxSkuInfoMap map[int]*StoreSkuNameExt
for _, vendorListValue := range jxStoreInfoListValue.StoreMaps { for _, vendorListValue := range jxStoreInfoListValue.StoreMaps {
vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"])) vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"]))
isSyncStoreSku := int(utils.MustInterface2Int64(vendorListValue["isSync"]))
if isSyncStoreSku == 0 {
continue
}
//filter for vendorID //filter for vendorID
if len(vendorMap) > 0 { if len(vendorMap) > 0 {
if _, ok := vendorMap[vendorID]; !ok { if _, ok := vendorMap[vendorID]; !ok {