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

Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

Browse Source
This commit is contained in:
gazebo
2019-12-21 13:06:46 +08:00
parent 9e92f40a47 bd5a9e5e7d
commit 3040e0baf7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2528,9 +2528,10 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
vendorStoreID := batchItemList[0].(string) vendorStoreID := batchItemList[0].(string)
var ( var (
inStoreSkuList []*partner.StoreSkuInfo inStoreSkuList []*partner.StoreSkuInfo
storeDetail *dao.StoreDetail storeDetail *dao.StoreDetail
inStoreSku = &partner.StoreSkuInfo{} inStoreSku = &partner.StoreSkuInfo{}
outStoreSkuList []*partner.StoreSkuInfo
) )
db := dao.GetDB() db := dao.GetDB()
skuNameList, err := dao.GetSkus(db, []int{skuID}, nil, nil, nil) skuNameList, err := dao.GetSkus(db, []int{skuID}, nil, nil, nil)
@@ -2549,7 +2550,12 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
inStoreSku.SkuID = skuID inStoreSku.SkuID = skuID
} }
inStoreSkuList = append(inStoreSkuList, inStoreSku) inStoreSkuList = append(inStoreSkuList, inStoreSku)
outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, v, task, 0, vendorStoreID, inStoreSkuList) storeDetail2, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID)
if storeDetail2 != nil {
outStoreSkuList, err = handler.GetStoreSkusBareInfo(ctx, v, task, storeDetail2.ID, vendorStoreID, inStoreSkuList)
} else {
outStoreSkuList, err = handler.GetStoreSkusBareInfo(ctx, v, task, 0, vendorStoreID, inStoreSkuList)
}
if storeDetail != nil { if storeDetail != nil {
if len(outStoreSkuList) == 0 { if len(outStoreSkuList) == 0 {
data := DataVendorStoreSkuPrice{ data := DataVendorStoreSkuPrice{