liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SensitiveWord相关修改测试

Browse Source
This commit is contained in:
平凡梦
2020-07-10 09:06:24 +08:00
parent c4b62a05dc
commit 946810c177
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sku.go
View File

@@ -727,7 +727,7 @@ func CheckHasSensitiveWord(word string) (bool, error) {
}
func IsSensitiveWordInList(str string) (bool, string) {
wordList, err := dao.GetSensitiveWordList()
wordList, err := dao.GetSensitiveWordList(2)
if err == nil {
for _, value := range wordList {
keyWord := value.Word

23
business/model/dao/sensitive_words.go
View File

@@ -7,22 +7,32 @@ import (
"time"
)
func GetSensitiveWordList() (wordList []*model.SensitiveWord, err error) {
sql := `SELECT * FROM sensitive_word WHERE deleted_at = ?`
err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue)
/*VendorID = 2 的时候是通用，保留之前的1，看后面会不会有扩展*/
func GetSensitiveWordList(vendorID int) (wordList []*model.SensitiveWord, err error) {
if vendorID == 0 {
vendorID = 2
}
sql := `SELECT * FROM sensitive_word WHERE deleted_at = ? AND vendor_id = ?`
err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue, vendorID)
return wordList, err
}
func InsertSensitiveWord(word string, vendorID int, userName string) error {
if vendorID == 0 {
vendorID = 2
}
sensitiveWord := &model.SensitiveWord{Word: word, VendorID: vendorID}
WrapAddIDCULDEntity(sensitiveWord, userName)
return CreateEntity(nil, sensitiveWord)
}
func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string) (word *model.SensitiveWord, err error) {
func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string, vendorID int) (word *model.SensitiveWord, err error) {
if id == 0 {
return nil, errors.New("入参错误，找不到相应ID")
}
if vendorID == 0 {
vendorID = 2
}
wordList.ID = id
wordList.DeletedAt = time.Now()
wordList.LastOperator = userName
@@ -32,10 +42,13 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string)
return wordList, nil
}
func UpdateSensitiveWord(wordList *model.SensitiveWord, id int, userName string, params ...string) (word *model.SensitiveWord, err error) {
func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, userName string, params ...string) (word *model.SensitiveWord, err error) {
if id == 0 {
return nil, errors.New("入参错误，找不到相应ID")
}
if vendorID == 0 {
vendorID = 2
}
wordList.ID = id
wordList.UpdatedAt = time.Now()
wordList.LastOperator = userName

7
controllers/cms_sku.go
View File

@@ -338,12 +338,13 @@ func (c *SkuController) SyncSku() {
// @Title 获取敏感词列表
// @Description 获取敏感词列表
// @Param token header string true "认证token"
// @Param vendorID query int false "VendorID"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetSensitiveWordList [get]
func (c *SkuController) GetSensitiveWordList() {
c.callGetSensitiveWordList(func(params *tSkuGetSensitiveWordListParams) (retVal interface{}, errCode string, err error) {
sensitiveWordList, err := dao.GetSensitiveWordList()
sensitiveWordList, err := dao.GetSensitiveWordList(2)
var wordList []string
for _, value := range sensitiveWordList {
wordList = append(wordList, value.Word)
@@ -388,9 +389,9 @@ func (c *SkuController) UpdateSensitiveWord() {
},
}
if params.Status == 1 {
retVal, err = dao.DeleteSensitiveWord(word, params.ID, params.Ctx.GetUserName())
retVal, err = dao.DeleteSensitiveWord(word, params.ID, params.Ctx.GetUserName(), params.VendorID)
} else {
retVal, err = dao.UpdateSensitiveWord(word, params.ID, params.Ctx.GetUserName(), "id", "word", "vendor_id", "last_operator")
retVal, err = dao.UpdateSensitiveWord(word, params.VendorID, params.ID, params.Ctx.GetUserName(), "id", "word", "vendor_id", "last_operator")
}
return retVal, "", err
})