操作日志查询增加错误，关键字，同步错误返回显示平台名

business/model/const.go

@@ -132,6 +132,8 @@ var (
 		"DeleteStoreCourierMap": "门店解绑三方配送平台",
 		"AddStoreCourierMap":    "门店绑定三方配送平台",
 		"UpdateStoreCourierMap": "门店修改三方配送平台绑定信息",
+		"Login":                 "登录",
+		"RegisterUser":          "注册",
 	}
 
 	MultiStoresVendorMap = map[int]int{

business/model/dao/event.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"strings"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -40,15 +41,25 @@ func DeleteOperateEvent(db *DaoDB, deleteTime time.Time) (err error) {
 	return err
 }
 
-func GetOperateEvents(db *DaoDB, name string, apiFunctions []string, operateTypes, skuIDs, storeIDs []int, fromTime, toTime time.Time, offset, pageSize int) (operateEventExt []*OperateEventExt, totalCount int, err error) {
+func GetOperateEvents(db *DaoDB, name string, apiFunctions []string, operateTypes, skuIDs, storeIDs []int, fromTime, toTime time.Time, keyword string, errType, offset, pageSize int) (operateEventExt []*OperateEventExt, totalCount int, err error) {
 	sql := `
 		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, c.name 
 		  FROM operate_event a
-		  LEFT JOIN operate_event_detail b ON a.access_uuid = b.access_uuid
+	`
+	if len(operateTypes) > 0 || len(skuIDs) > 0 || len(storeIDs) > 0 || keyword != "" {
+		sql += " LEFT JOIN operate_event_detail b ON a.access_uuid = b.access_uuid"
+	}
+	sql += `
 		  LEFT JOIN user c ON c.user_id = a.user_id
-		 WHERE 1=1
+		  WHERE 1=1
 	`
 	sqlParams := []interface{}{}
+	if errType == 1 {
+		sql += " AND a.err_msg = ''"
+	}
+	if errType == -1 {
+		sql += " AND a.err_msg <> ''"
+	}
 	if name != "" {
 		sql += " AND c.name LIKE ?"
 		sqlParams = append(sqlParams, "%"+name+"%")
@@ -77,6 +88,20 @@ func GetOperateEvents(db *DaoDB, name string, apiFunctions []string, operateType
 		sql += " AND b.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)
 	}
+	if keyword != "" {
+		sql += " AND ("
+		var apiList []string
+		for k, v := range model.ApiFunctionName {
+			if strings.Contains(v, keyword) {
+				apiList = append(apiList, k)
+			}
+		}
+		if len(apiList) > 0 {
+			sql += "a.api_function IN (" + GenQuestionMarks(len(apiList)) + ") OR"
+		}
+		sql += " a.err_msg LIKE ? OR b.thing_id LIKE ? OR b.store_id LIKE ? OR c.name LIKE ?)"
+		sqlParams = append(sqlParams, "%"+keyword+"%")
+	}
 	sql += ` 
 	ORDER BY a.created_at DESC
 	LIMIT ? OFFSET ?

business/model/event.go

@@ -10,6 +10,9 @@ type OperateEvent struct {
 	UserID       string    `orm:"column(user_id)" json:"userID"`
 	APIFunction  string    `orm:"column(api_function)" json:"apiFunction"`
 	JsonData     string    `orm:"size(3200)" json:"jsonData"`
+	ErrCode      string    `orm:"size(32)" json:"errCode"`
+	ErrMsg       string    `orm:"size(3200)" json:"errMsg"`
+	UseTime      int       `json:"useTime"`
 }
 
 func (v *OperateEvent) TableIndex() [][]string {