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

- up

Browse Source
This commit is contained in:
gazebo
2019-07-14 14:52:36 +08:00
parent 35c9b7db58
commit 434f8fb5e1
7 changed files with 137 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -18,7 +18,7 @@ func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice:
batchSize = mtwmapi.MaxStoreSkuBatchSize
case partner.FuncGetStoreSkusBareInfo:
batchSize = 1
batchSize = partner.UnlimitedBatchSize
case partner.FuncDeleteStoreSkus:
batchSize = 1 // 可考虑用批量操作
case partner.FuncCreateStoreSkus, partner.FuncUpdateStoreSkus:
@@ -246,8 +246,14 @@ func mtwmSkuStatus2Jx(mtwmSkuStatus int) (jxSkuStatus int) {
return jxSkuStatus
}
func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, skuIDs []int) (skuNameList []*partner.SkuNameInfo, err error) {
if len(skuIDs) == 0 {
func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (skuNameList []*partner.SkuNameInfo, err error) {
if len(storeSkuList) == 1 {
skuInfo, err := api.MtwmAPI.RetailGet(vendorStoreID, utils.Int2Str(storeSkuList[0].SkuID))
if err != nil {
return nil, err
}
skuNameList = append(skuNameList, vendorSku2Jx(skuInfo))
} else {
for {
result, err := api.MtwmAPI.RetailList(vendorStoreID, len(skuNameList), mtwmapi.GeneralMaxLimit)
if err != nil {
@@ -258,12 +264,6 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
break
}
}
} else {
skuInfo, err := api.MtwmAPI.RetailGet(vendorStoreID, utils.Int2Str(skuIDs[0]))
if err != nil {
return nil, err
}
skuNameList = append(skuNameList, vendorSku2Jx(skuInfo))
}
return skuNameList, err
}

27
business/partner/purchase/mtwm/store_sku2_test.go
View File

@@ -5,11 +5,12 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/partner"
// _ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
)
func TestGetStoreSkusFullInfo(t *testing.T) {
skuNameList, err := new(PurchaseHandler).GetStoreSkusFullInfo(jxcontext.AdminCtx, nil, 2, "2523687", nil)
skuNameList, err := curPurchaseHandler.GetStoreSkusFullInfo(jxcontext.AdminCtx, nil, 2, "2523687", nil)
if err != nil {
t.Fatal(err)
}
@@ -18,7 +19,14 @@ func TestGetStoreSkusFullInfo(t *testing.T) {
}
func TestGetStoreSkusBareInfo(t *testing.T) {
storeSkuList, err := curPurchaseHandler.GetStoreSkusBareInfo(jxcontext.AdminCtx, nil, 2, "2523687", nil)
storeSkuList, err := curPurchaseHandler.GetStoreSkusBareInfo(jxcontext.AdminCtx, nil, 2, "2523687", []*partner.StoreSkuInfo{
&partner.StoreSkuInfo{
SkuID: 969,
},
&partner.StoreSkuInfo{
SkuID: 1306,
},
})
if err != nil {
t.Fatal(err.Error())
}
@@ -39,3 +47,18 @@ func TestDeleteStoreAllCategories(t *testing.T) {
t.Fatal(err)
}
}
func TestGetStoreCategory(t *testing.T) {
_, err := curPurchaseHandler.GetStoreCategory(jxcontext.AdminCtx, 2, "2523687", "不存在的分类")
if err == nil {
t.Fatal("应该找不到这个分类")
}
catName := "小月饼"
cat, err := curPurchaseHandler.GetStoreCategory(jxcontext.AdminCtx, 2, "2523687", catName)
if err != nil {
t.Fatal(err)
} else if cat.Name != catName {
t.Fatal("没有找到正确的商家分类")
}
t.Log(utils.Format4Output(cat, false))
}