- ForceSyncSkuNames to SyncSkuNames

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) {
+func (v *VendorSync) SyncSkuNames(ctx *jxcontext.Context, nameIDs []int, isForce, isAsync, isContinueWhenError bool) (hint string, err error) {
-	sql := `
+	db := dao.GetDB()
+	if isForce {
+		sql := `
 	UPDATE sku t1
 	SET t1.jd_sync_status = t1.jd_sync_status | ?
 	WHERE t1.deleted_at = ?
 	`
-	sqlParams := []interface{}{
+		sqlParams := []interface{}{
-		model.SyncFlagModifiedMask,
+			model.SyncFlagModifiedMask,
-		utils.DefaultTimeValue,
+			utils.DefaultTimeValue,
-	}
+		}
-	if len(nameIDs) > 0 {
+		if len(nameIDs) > 0 {
-		sql += " AND t1.name_id IN(" + dao.GenQuestionMarks(len(nameIDs)) + ")"
+			sql += " AND t1.name_id IN(" + dao.GenQuestionMarks(len(nameIDs)) + ")"
-		sqlParams = append(sqlParams, nameIDs)
+			sqlParams = append(sqlParams, nameIDs)
-	}
+		}
-
+		if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
-	db := dao.GetDB()
+			return "", err
-	if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
+		}
-		return "", err
 	}
 	return v.SyncSkus(ctx, db, nameIDs, nil, isAsync, isContinueWhenError, ctx.GetUserName())
 }

controllers/cms_sync.go

@@ -140,20 +140,21 @@ func (c *SyncController) DeleteRemoteStoreSkus() {
 	})
 }
 
-// @Title 强制同步SKU（多门店平台）
+// @Title 同步SkuName（多门店平台）
-// @Description 强制同步SKU（多门店平台）
+// @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]
+// @router /SyncSkuNames [put]
-func (c *SyncController) ForceSyncSkuNames() {
+func (c *SyncController) SyncSkuNames() {
-	c.callForceSyncSkuNames(func(params *tSyncForceSyncSkuNamesParams) (retVal interface{}, errCode string, err error) {
+	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
 	})

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",