diff --git a/business/model/dao/thing_map.go b/business/model/dao/thing_map.go index 7eae8d568..9218e6bc9 100644 --- a/business/model/dao/thing_map.go +++ b/business/model/dao/thing_map.go @@ -50,7 +50,8 @@ func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64) (cats []*mo WHERE thing_id = ? AND vendor_id = ? t1.deleted_at = ? ` sqlParams := []interface{}{ - vendorId, thingId, + thingId, + vendorId, utils.DefaultTimeValue, } diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 75a66dcda..76af65910 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -211,12 +211,11 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v return failedList, err } -// UpdateStoreSkusStatus 批量更新商品上下架 +// UpdateStoreSkusStatus 批量更新商品上下架(上架商品库存更新最大,下架商品库存为0) func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) { api := getAPI(vendorOrgCode, storeID, vendorStoreID) if status == model.SkuStatusNormal { // 上架 for _, v := range storeSkuList { - // p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false) if err := api.EditStoreCommodityCommit(&product_editV2_commit_request.ProductEditV2Param2{ ProductId: utils.Str2Int64(v.VendorSkuID), Commit: true, @@ -225,14 +224,38 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr } else { failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常")...) } + if err := api.UpdateSkuStock(&sku_syncStock_request.SkuSyncStockParam{ + SkuId: utils.Str2Int64(v.VendorSkuAttrId), + ProductId: utils.Str2Int64(v.VendorSkuID), + Incremental: false, + IdempotentId: "", + StockNum: 9999, + OutWarehouseId: vendorStoreID, + }); err != nil { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品异常,添加固定库存")...) + } else { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常,添加固定库存")...) + } } } else { // 下架 for _, v := range storeSkuList { - err := api.ProductSetOffline(utils.Str2Int64(v.VendorSkuID)) - if err == nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品正常")...) + //err := api.ProductSetOffline(utils.Str2Int64(v.VendorSkuID)) + //if err == nil { + // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品正常")...) + //} else { + // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常")...) + //} + if err := api.UpdateSkuStock(&sku_syncStock_request.SkuSyncStockParam{ + SkuId: utils.Str2Int64(v.VendorSkuAttrId), + ProductId: utils.Str2Int64(v.VendorSkuID), + Incremental: false, + IdempotentId: "", + StockNum: 0, + OutWarehouseId: vendorStoreID, + }); err != nil { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常,库存更新为0")...) } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常")...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常,库存更新为0")...) } } } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 2f5074c16..e2876c871 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -531,13 +531,9 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, } - if mainSkuId == 0 { - sku.StockNum = 0 - } else { - sku.StockNum = 0 - sku.SkuType = 1 - sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} - } + sku.StockNum = localSku.Stock + sku.SkuType = 1 + sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} skuSize = append(skuSize, sku) } case 2: @@ -557,13 +553,9 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, } - if mainSkuId == 0 { - sku.StockNum = 0 - } else { - sku.StockNum = 0 - sku.SkuType = 1 - sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} - } + sku.StockNum = localSku.Stock + sku.SkuType = 1 + sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} skuSize = append(skuSize, sku) } } @@ -587,13 +579,10 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk {InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)}, }, } - if mainSkuId == 0 { - sku.StockNum = 0 - } else { - sku.StockNum = 0 - sku.SkuType = 1 - sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} - } + sku.StockNum = localSku.Stock + sku.StockNum = 0 + sku.SkuType = 1 + sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)} skuSize = append(skuSize, sku) } }