From d9276e5833ad90cc34d20e3fdcf13bfe482bf3c1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 25 Apr 2019 08:53:55 +0800
Subject: [PATCH] - ForceSyncSkuNames to SyncSkuNames

---
 business/jxstore/cms/sync.go          | 29 ++++++++++++++-------------
 controllers/cms_sync.go               | 13 ++++++------
 routers/commentsRouter_controllers.go | 18 ++++++++---------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index d68d9d828..2a91f51bd 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -568,24 +568,25 @@ func isSyncError(err error) bool {
 	return ok
 }
 
-func (v *VendorSync) ForceSyncSkuNames(ctx *jxcontext.Context, nameIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
-	sql := `
+func (v *VendorSync) SyncSkuNames(ctx *jxcontext.Context, nameIDs []int, isForce, isAsync, isContinueWhenError bool) (hint string, err error) {
+	db := dao.GetDB()
+	if isForce {
+		sql := `
 	UPDATE sku t1
 	SET t1.jd_sync_status = t1.jd_sync_status | ?
 	WHERE t1.deleted_at = ?
 	`
-	sqlParams := []interface{}{
-		model.SyncFlagModifiedMask,
-		utils.DefaultTimeValue,
-	}
-	if len(nameIDs) > 0 {
-		sql += " AND t1.name_id IN(" + dao.GenQuestionMarks(len(nameIDs)) + ")"
-		sqlParams = append(sqlParams, nameIDs)
-	}
-
-	db := dao.GetDB()
-	if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
-		return "", err
+		sqlParams := []interface{}{
+			model.SyncFlagModifiedMask,
+			utils.DefaultTimeValue,
+		}
+		if len(nameIDs) > 0 {
+			sql += " AND t1.name_id IN(" + dao.GenQuestionMarks(len(nameIDs)) + ")"
+			sqlParams = append(sqlParams, nameIDs)
+		}
+		if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
+			return "", err
+		}
 	}
 	return v.SyncSkus(ctx, db, nameIDs, nil, isAsync, isContinueWhenError, ctx.GetUserName())
 }
diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go
index 6b5e59a17..1a3048d11 100644
--- a/controllers/cms_sync.go
+++ b/controllers/cms_sync.go
@@ -140,20 +140,21 @@ func (c *SyncController) DeleteRemoteStoreSkus() {
 	})
 }
 
-// @Title 强制同步SKU（多门店平台）
-// @Description 强制同步SKU（多门店平台）
+// @Title 同步SkuName（多门店平台）
+// @Description 同步SkuName（多门店平台）
 // @Param	token			header		string	true	"认证token"
 // @Param	nameIDs			formData		string	false	"name ID列表"
+// @Param	isForce			formData		bool	false	"是否强制（设置修改标志）"
 // @Param	isAsync			formData		bool	false	"是否异步"
 // @Param	isContinueWhenError	formData	bool	false	"单个同步失败是否继续，缺省false"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router /ForceSyncSkuNames [put]
-func (c *SyncController) ForceSyncSkuNames() {
-	c.callForceSyncSkuNames(func(params *tSyncForceSyncSkuNamesParams) (retVal interface{}, errCode string, err error) {
+// @router /SyncSkuNames [put]
+func (c *SyncController) SyncSkuNames() {
+	c.callSyncSkuNames(func(params *tSyncSyncSkuNamesParams) (retVal interface{}, errCode string, err error) {
 		var nameIDs []int
 		if err = jxutils.Strings2Objs(params.NameIDs, &nameIDs); err == nil {
-			retVal, err = cms.CurVendorSync.ForceSyncSkuNames(params.Ctx, nameIDs, params.IsAsync, params.IsContinueWhenError)
+			retVal, err = cms.CurVendorSync.SyncSkuNames(params.Ctx, nameIDs, params.IsForce, params.IsAsync, params.IsContinueWhenError)
 		}
 		return retVal, "", err
 	})
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index b30c0d722..da6a6b99e 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1213,15 +1213,6 @@ 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: "ForceSyncSkuNames",
-            Router: `/ForceSyncSkuNames`,
-            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: "FullSyncStoresSkus",
@@ -1249,6 +1240,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: "SyncSkuNames",
+            Router: `/SyncSkuNames`,
+            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: "SyncStoresCategory",