From bc97ade75f63f0672374acab781cf4dd06d09d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 13:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=A8=E5=BA=97=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go         | 4 +++-
 controllers/cms_sync.go               | 8 +++++++-
 routers/commentsRouter_controllers.go | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ebc0eecdc..0e9f16baf 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1215,11 +1215,13 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 				outStoreMap = storeMap
 				_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 			} else {
-				fmt.Println("test1", err.Error())
 				dao.Rollback(db)
 			}
 		}
 	}
+	if err != nil {
+		return outStoreMap, err
+	}
 	if vendorID == model.VendorIDJDShop {
 		//绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存
 		//TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存
diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go
index 5a01cec7a..3b15447e4 100644
--- a/controllers/cms_sync.go
+++ b/controllers/cms_sync.go
@@ -377,5 +377,11 @@ func (c *SyncController) SyncStoreSkusFromYb() {
 // @Failure 200 {object} controllers.CallResult
 // @router /SyncJdsStoresSkus [put]
 func (c *SyncController) SyncJdsStoresSkus() {
-
+	c.callSyncJdsStoresSkus(func(params *tSyncSyncJdsStoresSkusParams) (retVal interface{}, errCode string, err error) {
+		var storeIDs []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err == nil {
+			retVal, err = cms.CurVendorSync.SyncJdsStoresSkus(params.Ctx, storeIDs, params.IsAsync, params.IsContinueWhenError)
+		}
+		return retVal, "", err
+	})
 }
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 1250ecf20..cfbcedf1b 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -2232,6 +2232,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
+        beego.ControllerComments{
+            Method: "SyncJdsStoresSkus",
+            Router: `/SyncJdsStoresSkus`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
         beego.ControllerComments{
             Method: "SyncSkuNames",