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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-12 16:53:22 +08:00
parent f47e36d04e
commit cd87619ac6
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxstore/cms/sync_store_sku.go
View File

@@ -927,6 +927,9 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v
step := batchItemList[0].(int) step := batchItemList[0].(int)
switch step { switch step {
case 0: case 0:
if vendorID == model.VendorIDJDShop {
storeID = model.JdShopMainStoreID2
}
localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeID, nil, false) localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeID, nil, false)
if err != nil { if err != nil {
return nil, err return nil, err

2
business/model/dao/store.go
View File

@@ -168,7 +168,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo
sqlParams = append(sqlParams, vendorOrgCode) sqlParams = append(sqlParams, vendorOrgCode)
} }
if vendorID == model.VendorIDJDShop && vendorOrgCode == "" { if vendorID == model.VendorIDJDShop && vendorOrgCode == "" {
sql += " AND t2.vendor_org_code = 1" sql += " AND t2.vendor_org_code = 2"
} }
if err = GetRow(db, &storeDetail, sql, sqlParams...); err == nil { if err = GetRow(db, &storeDetail, sql, sqlParams...); err == nil {
storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr) storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr)

53
business/partner/purchase/jdshop/store_sku.go
View File

@@ -11,7 +11,6 @@ import (
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -478,17 +477,29 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
pageNo = 1 pageNo = 1
pageSize = 20 pageSize = 20
) )
_, totalCount, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize) if result, totalCount, err := api.JdShop2API.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID}); err == nil && result != nil {
for ; pageNo <= totalCount/pageSize+1; pageNo++ { for ; pageNo <= totalCount/pageSize+1; pageNo++ {
result, _, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize) result2, _, err := api.JdShop2API.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID})
if err == nil { if err == nil {
for _, v := range result { for _, v := range result2 {
if skuName := vendorSku2Jx(v); skuName != nil { if skuName := vendorSku2Jx2(v); skuName != nil {
skuNameList = append(skuNameList, skuName) skuNameList = append(skuNameList, skuName)
} }
} }
} }
} }
}
// _, totalCount, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize)
// for ; pageNo <= totalCount/pageSize+1; pageNo++ {
// result, _, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize)
// if err == nil {
// for _, v := range result {
// if skuName := vendorSku2Jx(v); skuName != nil {
// skuNameList = append(skuNameList, skuName)
// }
// }
// }
// }
return skuNameList, err return skuNameList, err
} }
@@ -688,17 +699,6 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
return false return false
} }
func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) {
if ybStatus == yinbaoapi.SkuStatusEnable {
jxSkuStatus = model.SkuStatusNormal
} else if ybStatus == yinbaoapi.SkuStatusDisabled {
jxSkuStatus = model.SkuStatusDontSale
} else if ybStatus == yinbaoapi.SkuStatusDeleted {
jxSkuStatus = model.SkuStatusDeleted
}
return jxSkuStatus
}
func vendorSku2Jx(result *jdshopapi.SearchSkuListResult) (skuName *partner.SkuNameInfo) { func vendorSku2Jx(result *jdshopapi.SearchSkuListResult) (skuName *partner.SkuNameInfo) {
if result == nil { if result == nil {
globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true)) globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
@@ -722,6 +722,27 @@ func vendorSku2Jx(result *jdshopapi.SearchSkuListResult) (skuName *partner.SkuNa
return skuName return skuName
} }
func vendorSku2Jx2(result *jdshopapi.StoreProductSearchResult) (skuName *partner.SkuNameInfo) {
if result == nil {
globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
return nil
}
skuName = &partner.SkuNameInfo{
Name: result.SkuName,
SkuList: []*partner.SkuInfo{
&partner.SkuInfo{
StoreSkuInfo: partner.StoreSkuInfo{
VendorSkuID: utils.Int64ToStr(result.SkuID),
Stock: result.StockNum,
VendorPrice: jxutils.StandardPrice2Int(result.StorePrice),
},
},
},
Status: result.Status,
}
return skuName
}
func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (status int64, err error) { func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (status int64, err error) {
var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam
result, err := getAPI(storeCat.VendorOrgCode).FindShopCategories() result, err := getAPI(storeCat.VendorOrgCode).FindShopCategories()