From 9b68e75793fea6807341b1227b8cb1ef3da2fb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= <a1173589145@qq.com>
Date: Thu, 9 Jul 2020 09:27:15 +0800
Subject: [PATCH] =?UTF-8?q?sensitive=E7=9A=84=E6=96=B0=E5=A2=9E=E5=92=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/sensitive_words.go | 22 ++++++++++++----------
 controllers/cms_sku.go                | 19 +++++++++++++++++--
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/business/model/dao/sensitive_words.go b/business/model/dao/sensitive_words.go
index 3a9801574..47055aa75 100644
--- a/business/model/dao/sensitive_words.go
+++ b/business/model/dao/sensitive_words.go
@@ -19,26 +19,28 @@ func InsertSensitiveWord(word string, vendorID int, userName string) error {
 	return CreateEntity(nil, sensitiveWord)
 }
 
-func DeleteSensitiveWord(wordList *model.SensitiveWord, id int) error {
+func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string) (word *model.SensitiveWord, err error) {
 	if id == 0 {
-		return errors.New("入参错误，找不到相应ID")
+		return nil, errors.New("入参错误，找不到相应ID")
 	}
 	wordList.ID = id
 	wordList.DeletedAt = time.Now()
-	if _, err := UpdateEntity(nil, wordList, "deleted_at"); err != nil {
-		return err
+	wordList.LastOperator = userName
+	if _, err := UpdateEntity(nil, wordList, "deleted_at", "id", "last_operator", "vendor_id"); err != nil {
+		return nil, err
 	}
-	return nil
+	return wordList, nil
 }
 
-func UpdateSensitiveWord(wordList *model.SensitiveWord, id int, params ...string) error {
+func UpdateSensitiveWord(wordList *model.SensitiveWord, id int, userName string, params ...string) (word *model.SensitiveWord, err error) {
 	if id == 0 {
-		return errors.New("入参错误，找不到相应ID")
+		return nil, errors.New("入参错误，找不到相应ID")
 	}
 	wordList.ID = id
-	wordList.DeletedAt = time.Now()
+	wordList.UpdatedAt = time.Now()
+	wordList.LastOperator = userName
 	if _, err := UpdateEntity(nil, wordList, params...); err != nil {
-		return err
+		return nil, err
 	}
-	return nil
+	return wordList, err
 }
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index ce5e11d8f..ee418cadc 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -362,7 +362,10 @@ func (c *SkuController) GetSensitiveWordList() {
 // @Failure 200 {object} controllers.CallResult
 // @router /InsertSensitiveWord [post]
 func (c *SkuController) InsertSensitiveWord() {
-
+	c.callInsertSensitiveWord(func(params *tSkuInsertSensitiveWordParams) (retVal interface{}, errCode string, err error) {
+		err = dao.InsertSensitiveWord(params.Word, params.VendorID, params.Ctx.GetUserName())
+		return retVal, "", err
+	})
 }
 
 // @Title 修改敏感词列表
@@ -370,12 +373,24 @@ func (c *SkuController) InsertSensitiveWord() {
 // @Param	token			header		string	true	"认证token"
 // @Param	word			query		string	true	"关键词名字"
 // @Param	vendorID		query		int		false	"VendorID"
+// @Param	ID				query		int		true	"关键词ID"
 // @Param	Status			query		int		false	"状态，0为修改默认，1为删除"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /UpdateSensitiveWord [put]
 func (c *SkuController) UpdateSensitiveWord() {
-
+	c.callUpdateSensitiveWord(func(params *tSkuUpdateSensitiveWordParams) (retVal interface{}, errCode string, err error) {
+		word := &model.SensitiveWord{
+			VendorID: params.VendorID,
+			Word:     params.Word,
+		}
+		if params.Status == 1 {
+			retVal, err = dao.DeleteSensitiveWord(word, params.VendorID, params.Ctx.GetUserName())
+		} else {
+			retVal, err = dao.UpdateSensitiveWord(word, params.VendorID, params.Ctx.GetUserName(), "id", "word", "vendor_id", "last_operator")
+		}
+		return retVal, "", err
+	})
 }
 
 // @Title 子分类下商品的重排序