Accept Merge Request #218: (qidongsheng -> jdshop)

Merge Request: 修改关键字
Created By: @漆东升
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/218

business/jxstore/cms/sku.go

@@ -731,9 +731,9 @@ func IsSensitiveWordInList(str string) (bool, string) {
 	if err == nil {
 		for _, value := range wordList {
 			keyWord := value.Word
-			checkHas := strings.Contains(str, keyWord)
+			checkHas := strings.Contains(keyWord, str)
 			if checkHas {
-				return true, keyWord
+				return true, str
 			}
 		}
 	}

business/jxstore/cms/sync_store_sku.go

@@ -679,6 +679,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 							//handle error for sensitive words, if find, then insert to table sensitive_words
 							if sensitiveWord := GetSensitiveWord(singleStoreHandler, err.Error()); sensitiveWord != "" {
 								dao.InsertSensitiveWord(sensitiveWord, vendorID, ctx.GetUserName())
+								words, _ := dao.GetSensitiveWordList(vendorID)
+								word := words[0]
+								word.Word = word.Word + "," + sensitiveWord
+								dao.UpdateSensitiveWord(word, vendorID, 0, ctx.GetUserName())
 							}
 						}
 						successList := putils.UnselectStoreSkuSyncListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList))

business/model/dao/sensitive_words.go

@@ -3,6 +3,7 @@ package dao
 import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
 	"time"
 )
 
@@ -46,7 +47,7 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string,
 	return wordList, nil
 }
 
-func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, userName string, params ...string) (word *model.SensitiveWord, err error) {
+func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, userName string) (word *model.SensitiveWord, err error) {
 	if vendorID == 0 {
 		vendorID = -2
 	}
@@ -56,8 +57,15 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us
 	wordList.VendorID = vendorID
 	wordList.UpdatedAt = time.Now()
 	wordList.LastOperator = userName
-	if _, err := UpdateEntity(nil, wordList, params...); err != nil {
-		return nil, err
+	globals.SugarLogger.Debug("wordList:", wordList)
+	if id != 0 {
+		if _, err := UpdateEntity(nil, wordList, "id", "word", "vendor_id", "last_operator"); err != nil {
+			return nil, err
+		}
+	} else {
+		if _, err := UpdateEntity(nil, wordList, "word", "vendor_id", "last_operator"); err != nil {
+			return nil, err
+		}
 	}
 	return wordList, err
 }