From ccfebdb7ac7139b67f82ee2edcd033102324b119 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 1 Aug 2019 13:50:54 +0800
Subject: [PATCH] =?UTF-8?q?-=20UpdateStore=E4=B8=AD=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E5=9C=A8=E9=9C=80=E8=A6=81=E6=97=B6=E6=89=8D=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?updateCourierStores=20-=20=E4=BF=AE=E5=A4=8Djd.GetSkus=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go       | 6 +++---
 business/partner/purchase/jd/sku.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 25757d4d7..dd5ec5cc1 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -636,12 +636,12 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 					dao.Commit(db)
 					globals.SugarLogger.Debugf("UpdateStore track:%s, before call SyncStore", ctx.GetTrackInfo())
 					_, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName)
-					if err2 := updateCourierStores(ctx, storeID); err2 != nil && err == nil {
-						err = err2
-					}
 					if valid["tel1"] != nil {
 						BindMobile2Store(ctx, utils.Interface2String(valid["tel1"]), storeID)
 					}
+					if syncStatus&model.SyncFlagStoreAddress != 0 && valid["tel1"] != nil || valid["payeeName"] != nil {
+						updateCourierStores(ctx, storeID)
+					}
 				}
 			} else {
 				dao.Commit(db)
diff --git a/business/partner/purchase/jd/sku.go b/business/partner/purchase/jd/sku.go
index 2e3365b8c..16f52a6ce 100644
--- a/business/partner/purchase/jd/sku.go
+++ b/business/partner/purchase/jd/sku.go
@@ -583,7 +583,7 @@ func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCat
 
 func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, skuID int, vendorSkuID, skuName string) (skuNameList []*partner.SkuNameInfo, err error) {
 	param := &jdapi.QuerySkuParam{
-		SkuID:       utils.Str2Int64(vendorSkuID),
+		SkuID:       utils.Str2Int64WithDefault(vendorSkuID, 0),
 		SkuName:     skuName,
 		IsFilterDel: jdapi.IsFilterDelTrue,
 		PageNo:      1,