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

京东商城修改，删除规格

Browse Source
This commit is contained in:
苏尹岚
2020-05-20 11:48:04 +08:00
parent 6df82d79a5
commit 45214ba928
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1286,7 +1286,8 @@ func DeleteSku(ctx *jxcontext.Context, skuID int, userName string) (num int64, e
return 0, err return 0, err
} }
dao.Commit(db) dao.Commit(db)
if _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), []int{skuID}, model.SyncFlagDeletedMask); err == nil {
}
if num == 1 { if num == 1 {
_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName) _, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
} }

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

@@ -600,6 +600,11 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
createList = createList[:] createList = createList[:]
createList = rList createList = rList
} }
if len(updateList) > 0 {
rList2 := changeList2Jds(updateList)
updateList = updateList[:]
updateList = rList2
}
} }
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {

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

@@ -38,7 +38,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
for _, vv := range v.StoreSkuSyncInfoJds { for _, vv := range v.StoreSkuSyncInfoJds {
v.JdsWareID = result.Data[0].WareID v.JdsWareID = result.Data[0].WareID
vv.JdsWareID = result.Data[0].WareID vv.JdsWareID = result.Data[0].WareID
updateSkusParam, err := buildUpdateSkusParam(v, vv) updateSkusParam, err := buildUpdateSkusParam(v, vv, true)
if err != nil { if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
return failedList, err return failedList, err
@@ -119,6 +119,14 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
} }
err = api.JdShopAPI.UpdateWare(updateWareParam) err = api.JdShopAPI.UpdateWare(updateWareParam)
for _, vv := range v.StoreSkuSyncInfoJds {
updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
return failedList, err
}
_, err = api.JdShopAPI.UpdateSkus(updateSkusParam)
}
} }
if err != nil { if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息") failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
@@ -129,15 +137,16 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID { if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
// for _, v := range storeSkuList { for _, v := range storeSkuList {
err = api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
// err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2) // err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
// if err == nil { // if err == nil {
// err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2)) // err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
// } // }
// } }
// if err != nil { if err != nil {
// failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品") failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
// } }
} }
return failedList, err return failedList, err
} }
@@ -559,7 +568,7 @@ func filterSensitiveWord(name string) (result string) {
return name return name
} }
func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInfo) (updateSkusParam *jdshopapi.UpdateSkusParam, err error) { func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInfo, isCreate bool) (updateSkusParam *jdshopapi.UpdateSkusParam, err error) {
updateSkusParam = &jdshopapi.UpdateSkusParam{ updateSkusParam = &jdshopapi.UpdateSkusParam{
WareID: storeSku.JdsWareID, WareID: storeSku.JdsWareID,
} }
@@ -603,6 +612,9 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
} else { } else {
sku.StockNum = "0" sku.StockNum = "0"
} }
if !isCreate {
sku.SkuID = utils.Str2Int64(v.VendorSkuID)
}
skus = append(skus, sku) skus = append(skus, sku)
updateSkusParam.Skus = skus updateSkusParam.Skus = skus
return updateSkusParam, err return updateSkusParam, err