From c8d404516717db167ee06f411a4e2bef91b84f50 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 26 Apr 2019 14:36:00 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E6=97=B6=EF=BC=8C=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E6=94=B9=E4=BB=B7=EF=BC=8C=E5=8F=AF=E5=94=AE=E6=A0=87?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/store_sku.go | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go
index 51c04f081..96c1848b1 100644
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -387,16 +387,13 @@ func (p *PurchaseHandler) RefreshStoresAllSkusID(ctx *jxcontext.Context, parentT
 func genSkuParamsFromStoreSkuInfo(storeSku *tStoreSkuFullInfo) (params map[string]interface{}) {
 	price := jxutils.CaculateSkuVendorPrice(storeSku.Price, storeSku.PricePercentage)
 	params = map[string]interface{}{
-		"name":         jxutils.ComposeSkuName(storeSku.Prefix, storeSku.Name, storeSku.Comment, storeSku.Unit, storeSku.SpecQuality, storeSku.SpecUnit, 0),
-		"status":       jxSkuStatus2Ebai(jxutils.MergeSkuStatus(storeSku.SkuStatus, storeSku.Status)),
-		"left_num":     model.MaxStoreSkuStockQty,
-		"sale_price":   price,
-		"market_price": price,
-		"category_id":  storeSku.CatEbaiID,
-		"cat1_id":      getEbaiCat(storeSku.EbaiCat1ID, 1),
-		"cat2_id":      getEbaiCat(storeSku.EbaiCat2ID, 2),
-		"cat3_id":      getEbaiCat(storeSku.EbaiCat3ID, 3),
-		"weight":       storeSku.Weight,
+		"name":        jxutils.ComposeSkuName(storeSku.Prefix, storeSku.Name, storeSku.Comment, storeSku.Unit, storeSku.SpecQuality, storeSku.SpecUnit, 0),
+		"left_num":    model.MaxStoreSkuStockQty,
+		"category_id": storeSku.CatEbaiID,
+		"cat1_id":     getEbaiCat(storeSku.EbaiCat1ID, 1),
+		"cat2_id":     getEbaiCat(storeSku.EbaiCat2ID, 2),
+		"cat3_id":     getEbaiCat(storeSku.EbaiCat3ID, 3),
+		"weight":      storeSku.Weight,
 		"photos": []map[string]interface{}{
 			map[string]interface{}{
 				"is_master": true,
@@ -404,6 +401,13 @@ func genSkuParamsFromStoreSkuInfo(storeSku *tStoreSkuFullInfo) (params map[strin
 			},
 		},
 	}
+	if storeSku.EbaiSyncStatus&(model.SyncFlagPriceMask|model.SyncFlagNewMask) != 0 {
+		params["sale_price"] = price
+		params["market_price"] = price
+	}
+	if storeSku.EbaiSyncStatus&(model.SyncFlagSaleMask|model.SyncFlagNewMask) != 0 {
+		params["status"] = jxSkuStatus2Ebai(jxutils.MergeSkuStatus(storeSku.SkuStatus, storeSku.Status))
+	}
 	// todo 饿百如果给的UPC是空要报错，但如果我要删除UPC怎么弄？
 	if storeSku.Upc != "" {
 		params["upc"] = storeSku.Upc