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

store_sku.go中去掉对于JdID的引用

Browse Source
This commit is contained in:
gazebo
2020-01-02 14:41:45 +08:00
parent dcd4dd683d
commit c444202330
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/jxstore/cms/store_sku.go
View File

@@ -1890,7 +1890,7 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
return "", fmt.Errorf("此功能当前只支持京东到家平台") return "", fmt.Errorf("此功能当前只支持京东到家平台")
} }
db := dao.GetDB() db := dao.GetDB()
storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "") storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "")
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -1907,13 +1907,13 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
return "", err return "", err
} }
} }
skuList, err := dao.GetSkus(db, nil, nil, nil, nil) skuList, err := dao.GetSkusWithVendor(db, []int{vendorID}, nil, nil, nil, false)
if err != nil { if err != nil {
return "", err return "", err
} }
skuNameMap := make(map[int]*model.SkuName) skuNameMap := make(map[int]*model.SkuName)
skuMap := make(map[int]*model.SkuAndName) skuMap := make(map[int]*dao.StoreSkuSyncInfo)
var bareStoreSkuList []*partner.StoreSkuInfo bareStoreSkuMap := make(map[string][]*partner.StoreSkuInfo)
for _, sku := range skuList { for _, sku := range skuList {
if skuNameMap[sku.NameID] == nil { if skuNameMap[sku.NameID] == nil {
skuNameMap[sku.NameID] = &model.SkuName{ skuNameMap[sku.NameID] = &model.SkuName{
@@ -1922,9 +1922,9 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
} }
skuMap[sku.ID] = sku skuMap[sku.ID] = sku
bareStoreSkuList = append(bareStoreSkuList, &partner.StoreSkuInfo{ bareStoreSkuMap[sku.VendorOrgCode] = append(bareStoreSkuMap[sku.VendorOrgCode], &partner.StoreSkuInfo{
SkuID: sku.ID, SkuID: sku.ID,
VendorSkuID: utils.Int64ToStr(sku.JdID), VendorSkuID: sku.VendorSkuID,
}) })
} }
@@ -1937,7 +1937,7 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
switch step { switch step {
case 0: case 0:
bareStoreSkuList, err2 := handler.GetStoreSkusBareInfo(ctx, oneStoreMap.VendorOrgCode, task, oneStoreMap.StoreID, oneStoreMap.VendorStoreID, bareStoreSkuList) bareStoreSkuList, err2 := handler.GetStoreSkusBareInfo(ctx, oneStoreMap.VendorOrgCode, task, oneStoreMap.StoreID, oneStoreMap.VendorStoreID, bareStoreSkuMap[oneStoreMap.VendorOrgCode])
// globals.SugarLogger.Debug(utils.Format4Output(bareStoreSkuList, false)) // globals.SugarLogger.Debug(utils.Format4Output(bareStoreSkuList, false))
if err = err2; err == nil || len(bareStoreSkuList) > 0 { if err = err2; err == nil || len(bareStoreSkuList) > 0 {
err = nil // todo 如果部分失败，强制忽略错误 err = nil // todo 如果部分失败，强制忽略错误
@@ -2624,15 +2624,15 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
outStoreSkuList []*partner.StoreSkuInfo outStoreSkuList []*partner.StoreSkuInfo
) )
db := dao.GetDB() db := dao.GetDB()
skuNameList, err := dao.GetSkus(db, []int{skuID}, nil, nil, nil) skuList, err := dao.GetSkusWithVendor(db, []int{vendorID}, []string{v}, nil, []int{skuID}, false)
if err != nil { if err != nil {
return retVal, err return retVal, err
} }
if partner.IsMultiStore(vendorID) { if partner.IsMultiStore(vendorID) {
multiHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler) multiHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler)
storeDetail, err = multiHandler.ReadStore(ctx, v, vendorStoreID) storeDetail, err = multiHandler.ReadStore(ctx, v, vendorStoreID)
if len(skuNameList) > 0 { if len(skuList) > 0 {
inStoreSku.VendorSkuID = utils.Int64ToStr(skuNameList[0].JdID) inStoreSku.VendorSkuID = skuList[0].VendorSkuID
} }
} else { } else {
singleHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreHandler) singleHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreHandler)
@@ -2652,7 +2652,7 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
StoreID: vendorStoreID, StoreID: vendorStoreID,
StoreName: storeDetail.Name, StoreName: storeDetail.Name,
SkuID: skuID, SkuID: skuID,
SkuName: skuNameList[0].Name, SkuName: skuList[0].Name,
VendorPrice: "", VendorPrice: "",
} }
retVal = []DataVendorStoreSkuPrice{data} retVal = []DataVendorStoreSkuPrice{data}
@@ -2661,7 +2661,7 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
StoreID: vendorStoreID, StoreID: vendorStoreID,
StoreName: storeDetail.Name, StoreName: storeDetail.Name,
SkuID: skuID, SkuID: skuID,
SkuName: skuNameList[0].Name, SkuName: skuList[0].Name,
VendorPrice: utils.Float64ToStr(utils.Str2Float64(utils.Int64ToStr(outStoreSkuList[0].VendorPrice)) / 100), VendorPrice: utils.Float64ToStr(utils.Str2Float64(utils.Int64ToStr(outStoreSkuList[0].VendorPrice)) / 100),
} }
retVal = []DataVendorStoreSkuPrice{data} retVal = []DataVendorStoreSkuPrice{data}