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

- 适配新平台API对于门店商品操作部分失败时返回详情的改动（没有实现处理）

Browse Source
This commit is contained in:
gazebo
2019-07-21 16:20:23 +08:00
parent 16292174d1
commit 4492f9990f
8 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/purchase/mtwm/mtwm.go
View File

@@ -153,10 +153,10 @@ func bizStatusJX2Mtwm(status int) (openLevel, online int) {
}
func skuStatusJX2Mtwm(status int) int {
if status == 1 {
return 0
if status == model.SkuStatusNormal {
return mtwmapi.SellStatusOnline
}
return 1
return mtwmapi.SellStatusOffline
}
func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, imgURL string, imgData []byte, imgName string) (imgHint string, err error) {

11
business/partner/purchase/mtwm/store_sku.go
View File

@@ -361,7 +361,16 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks
globals.SugarLogger.Debugf("mtwm SyncStoreSkus4 skuID:%d, SkuSyncStatus:%d", skuItem.SkuID, skuItem.StoreSkuSyncStatus)
sellStatus := skuStatusJX2Mtwm(jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus))
if globals.EnableMtwmStoreWrite {
if err2 := api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, foodDataList, sellStatus); err2 != nil {
if _, err2 := api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, []*mtwmapi.BareStoreFoodInfo{
&mtwmapi.BareStoreFoodInfo{
AppFoodCode: utils.Int2Str(skuItem.SkuID),
Skus: []*mtwmapi.BareStoreSkuInfo{
&mtwmapi.BareStoreSkuInfo{
SkuID: utils.Int2Str(skuItem.SkuID),
},
},
},
}, sellStatus); err2 != nil {
err = err2
}
}

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

@@ -13,6 +13,12 @@ import (
"git.rosy.net.cn/jx-callback/globals/api"
)
const (
updateTypeStock = iota
updateTypeStatus
updateTypePrice
)
func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
switch funcID {
case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice:
@@ -145,7 +151,12 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
}
}
if globals.EnableMtwmStoreWrite {
err = api.MtwmAPI.RetailBatchInitData(vendorStoreID, foodDataList)
if len(foodDataList) == 1 {
foodDataList[0]["skus"] = string(utils.MustMarshal(foodDataList[0]["skus"]))
err = api.MtwmAPI.RetailInitData(vendorStoreID, utils.Int2Str(storeSkuList[0].SkuID), foodDataList[0])
} else if len(foodDataList) > 0 {
_, err = api.MtwmAPI.RetailBatchInitData(vendorStoreID, foodDataList)
}
}
if err == nil {
for _, storeSku := range storeSkuList {
@@ -169,8 +180,7 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
return err
}
func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
var validSkus, invalidSkus []*mtwmapi.BareStoreFoodInfo
func storeSku2Mtwm(storeSkuList []*partner.StoreSkuInfo, updateType int) (validSkus, invalidSkus []*mtwmapi.BareStoreFoodInfo) {
for _, storeSku := range storeSkuList {
skuInfo := &mtwmapi.BareStoreFoodInfo{
AppFoodCode: storeSku.VendorSkuID,
@@ -180,65 +190,55 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID
},
},
}
if storeSku.Status == model.SkuStatusNormal {
if updateType == updateTypeStock {
if storeSku.Stock == model.MaxStoreSkuStockQty {
skuInfo.Skus[0].Stock = "*"
} else {
skuInfo.Skus[0].Stock = utils.Int2Str(storeSku.Stock)
}
} else if updateType == updateTypePrice {
skuInfo.Skus[0].Price = jxutils.IntPrice2StandardString(storeSku.VendorPrice)
}
if updateType != updateTypeStatus || storeSku.Status == model.SkuStatusNormal {
validSkus = append(validSkus, skuInfo)
} else {
invalidSkus = append(invalidSkus, skuInfo)
}
}
return validSkus, invalidSkus
}
func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
validSkus, invalidSkus := storeSku2Mtwm(storeSkuList, updateTypeStatus)
if globals.EnableMtwmStoreWrite {
if len(invalidSkus) > 0 {
err = api.MtwmAPI.RetailSkuSellStatus2(vendorStoreID, invalidSkus, 1)
_, err = api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, invalidSkus, mtwmapi.SellStatusOffline)
}
if err == nil && len(validSkus) > 0 {
err = api.MtwmAPI.RetailSkuSellStatus2(vendorStoreID, validSkus, 0)
_, err = api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, validSkus, mtwmapi.SellStatusOnline)
}
}
return err
}
func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
var priceList []*mtwmapi.BareStoreFoodInfo
for _, storeSku := range storeSkuList {
skuInfo := &mtwmapi.BareStoreFoodInfo{
AppFoodCode: storeSku.VendorSkuID,
Skus: []*mtwmapi.BareStoreSkuInfo{
&mtwmapi.BareStoreSkuInfo{
SkuID: storeSku.VendorSkuID,
Price: jxutils.IntPrice2StandardString(storeSku.VendorPrice),
},
},
}
priceList = append(priceList, skuInfo)
}
priceList, _ := storeSku2Mtwm(storeSkuList, updateTypePrice)
if globals.EnableMtwmStoreWrite {
err = api.MtwmAPI.RetailSkuPrice(vendorStoreID, priceList)
_, err = api.MtwmAPI.RetailSkuPrice(vendorStoreID, priceList)
}
return err
}
func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
var stockList []*mtwmapi.BareStoreFoodInfo
for _, storeSku := range storeSkuList {
skuInfo := &mtwmapi.BareStoreFoodInfo{
AppFoodCode: storeSku.VendorSkuID,
Skus: []*mtwmapi.BareStoreSkuInfo{
&mtwmapi.BareStoreSkuInfo{
SkuID: storeSku.VendorSkuID,
Stock: utils.Int2Str(storeSku.Stock),
},
},
}
stockList = append(stockList, skuInfo)
}
stockList, _ := storeSku2Mtwm(storeSkuList, updateTypeStock)
if globals.EnableMtwmStoreWrite {
err = api.MtwmAPI.RetailSkuStock(vendorStoreID, stockList)
_, err = api.MtwmAPI.RetailSkuStock(vendorStoreID, stockList)
}
return err
}
func mtwmSkuStatus2Jx(mtwmSkuStatus int) (jxSkuStatus int) {
if mtwmSkuStatus == 0 {
if mtwmSkuStatus == mtwmapi.SellStatusOnline {
jxSkuStatus = model.SkuStatusNormal
} else {
jxSkuStatus = model.SkuStatusDontSale