From 9271052a9edfd1513c07b16efc923b03a898cc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 21 May 2020 10:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/tempop/tempop.go | 5 ----- business/partner/purchase/jdshop/store_sku.go | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index cc9b98420..045d7dc5c 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1526,11 +1526,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { } request.AddCookie(c) client := &http.Client{} - deadline := 1 - d := time.Now().Add(time.Duration(deadline) * time.Second) // deadline max - ctx2, cancel := context.WithDeadline(context.Background(), d) - defer cancel() - request.WithContext(ctx2) fmt.Println(request) response, _ := client.Do(request) defer response.Body.Close() diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index c690172aa..d208a47c0 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -169,7 +169,11 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr if vendorStoreID == model.JdShopMainVendorStoreID { err = api.JdShopAPI.UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock) } else { - err = api.JdShopAPI.UpdateSkuSiteStock(utils.Str2Int(v.VendorSkuID), stock, utils.Str2Int(vendorStoreID)) + storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{storeID}, []int{v.SkuID}) + err = err2 + if len(storeSkus) > 0 { + err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID)) + } } } if err != nil {