From daef0cbef3be76605e75043d747f16281bf5062b 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, 30 Apr 2020 09:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E6=9B=B4=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=EF=BC=8C=E5=B0=9D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/delivery.go     |  2 +-
 business/partner/purchase/yb/store_sku.go | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go
index fa6851386..1602fe3b7 100644
--- a/business/partner/delivery/delivery.go
+++ b/business/partner/delivery/delivery.go
@@ -62,7 +62,7 @@ func CalculateDeliveryFee(db *dao.DaoDB, jxStoreID int, hint string, consigneeLn
 		deliveryFee = priceInfo.CityPrice
 	}
 	if deliveryFee == 0 {
-		globals.SugarLogger.Warnf("CalculateOrderDeliveryFee 查不到美团配送价格 orderID:%s", hint)
+		// globals.SugarLogger.Warnf("CalculateOrderDeliveryFee 查不到美团配送价格 orderID:%s", hint)
 		deliveryFee = 650
 	}
 	if lng == 0 || lat == 0 {
diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go
index a0bc99f26..f1c660490 100644
--- a/business/partner/purchase/yb/store_sku.go
+++ b/business/partner/purchase/yb/store_sku.go
@@ -39,7 +39,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			storeSku.VendorSkuID = utils.Int64ToStr(result.UID)
 			uploadYbImage(vendorStoreID, storeSku.YbBarCode, storeSku.Img)
 			if !flag {
-				updateYbSku(vendorStoreID, storeSku.YbBarCode)
+				updateYbSku(vendorStoreID, storeSku.YbBarCode, nil)
 			}
 		}
 	}
@@ -47,6 +47,17 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 }
 
 func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableYbStoreWrite {
+		for _, v := range storeSkuList {
+			saveProductParam := &yinbaoapi.SaveProductParam{
+				CategoryUid: v.VendorCatID,
+			}
+			updateYbSku(vendorStoreID, v.YbBarCode, saveProductParam)
+			if err != nil {
+				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDYB], "修改商品")
+			}
+		}
+	}
 	return failedList, err
 }
 
@@ -415,12 +426,12 @@ func loopPages(parameterType, parameterValue string, skuNameList *[]*partner.Sku
 		return err
 	}
 	for _, v := range resultPages.Result {
-		resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode)
+		// resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode)
 		// resultp, err := getProductImages(vendorStoreID, v.Barcode)
 		if err != nil {
 			return err
 		}
-		// var resultp []*yinbaoapi.QueryProductImagesByBarcodeResult
+		var resultp []*yinbaoapi.QueryProductImagesByBarcodeResult
 		vv := &yinbaoapi.QueryProductByBarcodeResult{}
 		err = utils.Map2StructByJson(utils.Struct2MapByJson(v), vv, false)
 		if skuName := vendorSku2Jx(vv, resultp); skuName != nil {
@@ -468,9 +479,9 @@ func convertVendorCatList(remoteCats []*yinbaoapi.LoadCategorysWithOptionResult)
 	return cats
 }
 
-func updateYbSku(vendorStoreID, ybBarCode string) (err error) {
+func updateYbSku(vendorStoreID, ybBarCode string, saveProductParam *yinbaoapi.SaveProductParam) (err error) {
 	for {
-		err = api.YinBaoAPI.SaveProduct(vendorStoreID, ybBarCode)
+		err = api.YinBaoAPI.SaveProduct(vendorStoreID, ybBarCode, saveProductParam)
 		if err == nil {
 			break
 		} else {
@@ -479,7 +490,7 @@ func updateYbSku(vendorStoreID, ybBarCode string) (err error) {
 				if err != nil {
 					break
 				}
-				err = updateYbSku(vendorStoreID, ybBarCode)
+				err = updateYbSku(vendorStoreID, ybBarCode, saveProductParam)
 			} else {
 				break
 			}