操作日志记录（beta）-门店商品

business/jxstore/cms/cms.go

@@ -143,6 +143,7 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
 			"supplementType":         model.SupplementTypeName,
 			"operateType":            model.OperateTypeName,
 			"thingType":              model.ThingTypeName,
+			"apiFunctionName":        model.ApiFunctionName,
 		},
 	}
 }

business/jxstore/cms/store_sku.go

@@ -13,6 +13,8 @@ import (
 	"time"
 	"unicode"
 
+	"git.rosy.net.cn/jx-callback/globals/refutil"
+
 	"git.rosy.net.cn/jx-callback/business/jxstore/event"
 
 	"git.rosy.net.cn/baseapi"
@@ -1037,7 +1039,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 								if tmpStatus := getSkuSaleStatus(inSkuBind, skuBindInfo); tmpStatus != model.StoreSkuBindStatusNA {
 									skuBind.Status = tmpStatus
 								}
-								// err = AddEventDetail(model.OperateAdd, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "")
+								err = AddEventDetail(model.OperateAdd, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "")
 								setStoreSkuBindStatus(skuBind, model.SyncFlagNewMask)
 								dao.WrapAddIDCULDEntity(skuBind, userName)
 								// globals.SugarLogger.Debug(utils.Format4Output(skuBind, false))
@@ -1061,9 +1063,10 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 								}
 							}
 						} else {
+							beforeMsg := *v
 							skuBind = &v.StoreSkuBind
 							if skuBindInfo.IsFocus == -1 && isCanChangePrice {
-								// err = AddEventDetail(model.OperateDelete, skuBind.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "")
+								err = AddEventDetail(model.OperateDelete, skuBind.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "")
 								if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{
 									model.FieldStatus:         model.StoreSkuBindStatusDeleted,
 									model.FieldJdSyncStatus:   model.SyncFlagDeletedMask,
@@ -1117,12 +1120,13 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 										skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd
 									}
 								}
-								// if updateFieldMap != nil {
-								// 	afterData := utils.MustMarshal(updateFieldMap)
-								// 	mapresult := refutil.FindMapAndStructMixed(updateFieldMap, skuBind)
-								// 	beforeData := utils.MustMarshal(mapresult)
-								// 	AddEventDetail(model.OperateUpdate, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), string(beforeData), string(afterData))
-								// }
+								if len(updateFieldMap) > 0 {
+									mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind)
+									afterData := utils.MustMarshal(mapAfter)
+									mapBefore := refutil.FindMapAndStructMixed(updateFieldMap, beforeMsg)
+									beforeData := utils.MustMarshal(mapBefore)
+									err = AddEventDetail(model.OperateUpdate, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), string(beforeData), string(afterData))
+								}
 								if len(updateFieldMap) > 0 {
 									updateFieldMap[model.FieldJdSyncStatus] = 1
 									updateFieldMap[model.FieldEbaiSyncStatus] = 1
@@ -1225,6 +1229,7 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind
 	for _, skuBind := range storeSkuList {
 		if v := skuBindSkuInfosMap[skuBind.SkuID]; v != nil && v.IsSale != 0 {
 			if !(!utils.IsTimeZero(autoSaleTime) && ignoreDontSale && skuBind.Status == model.StoreSkuBindStatusDontSale) {
+				statusResult := skuBind.Status
 				if v.IsSale == -1 || !utils.IsTimeZero(autoSaleTime) {
 					skuBind.Status = model.StoreSkuBindStatusDontSale
 				} else if v.IsSale == 1 {
@@ -1243,6 +1248,21 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind
 				} else {
 					kvs["AutoSaleAt"] = autoSaleTime
 				}
+				var status int
+				if v.IsSale == -1 {
+					status = model.StoreSkuBindStatusDontSale
+				} else {
+					status = model.StoreSkuBindStatusNormal
+				}
+				if status != statusResult {
+					mapAfter := make(map[string]interface{})
+					mapAfter["Status"] = status
+					afterData := utils.MustMarshal(mapAfter)
+					mapBefore := make(map[string]interface{})
+					mapBefore["Status"] = statusResult
+					beforeData := utils.MustMarshal(mapBefore)
+					err = AddEventDetail(model.OperateUpdate, v.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), string(beforeData), string(afterData))
+				}
 				if num, err = dao.UpdateEntityLogically(db, skuBind, kvs, userName, nil); err != nil {
 					dao.Rollback(db)
 					return nil, err
@@ -1300,7 +1320,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, co
 	if copyMode != CopyStoreSkuModeFresh && copyMode != CopyStoreSkuModeUpdate && copyMode != CopyStoreSkuModeUpdatePrice {
 		return 0, fmt.Errorf("不支持的拷贝模式：%s", copyMode)
 	}
-
 	db := dao.GetDB()
 	fromStore, err := checkStoreExisting(db, fromStoreID)
 	if err != nil {
@@ -1559,6 +1578,15 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, co
 		globals.SugarLogger.Debugf("CopyStoreSkus fromStoreID:%d, toStoreID:%d, trackInfo:%s num3:%d", fromStoreID, toStoreID, ctx.GetTrackInfo(), num2)
 		dao.Commit(db)
 	}
+	mapAfter := make(map[string]interface{})
+	mapAfter["ToStoreIDs"] = toStoreIDs
+	mapAfter["CopyMode"] = copyMode
+	mapAfter["IsScale"] = isScale
+	afterData := utils.MustMarshal(mapAfter)
+	mapBefore := make(map[string]interface{})
+	mapBefore["FromStoreID"] = fromStoreID
+	beforeData := utils.MustMarshal(mapBefore)
+	err = AddEventDetail(model.OperateCopyStoreSkus, 0, model.ThingTypeSku, fromStoreID, ctx.GetTrackInfo(), string(beforeData), string(afterData))
 	return num, errList.GetErrListAsOne()
 }
 

business/jxstore/event/event.go

@@ -4,6 +4,9 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi/utils"
+
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -52,3 +55,43 @@ func AddOperateEventDetail(operateEventDetail *model.OperateEventDetail) (err er
 	dao.Commit(db)
 	return err
 }
+
+func DeleteOperateEventAndDetail(ctx *jxcontext.Context, deleteTime time.Time) (err error) {
+	db := dao.GetDB()
+	dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			dao.Rollback(db)
+			panic(r)
+		}
+	}()
+	dao.DeleteOperateEventDetail(db, deleteTime)
+	dao.DeleteOperateEvent(db, deleteTime)
+	dao.Commit(db)
+	return err
+}
+
+func GetOperateEvents(ctx *jxcontext.Context, apiFunction, name string, operateType int, skuIDs, storeIDs []int, fromTime, toTime string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
+	var (
+		fromTimeP time.Time
+		toTimeP   time.Time
+	)
+	db := dao.GetDB()
+	if fromTime != "" {
+		fromTimeP = utils.Str2Time(fromTime)
+	}
+	if toTime != "" {
+		toTimeP = utils.Str2Time(toTime)
+	}
+	pageSize = jxutils.FormalizePageSize(pageSize)
+	offset = jxutils.FormalizePageOffset(offset)
+	operateEventExt, totalCount, err := dao.GetOperateEvents(db, apiFunction, name, operateType, skuIDs, storeIDs, fromTimeP, toTimeP, offset, pageSize)
+	if err != nil {
+		return pageInfo, err
+	}
+	pageInfo = &model.PagedInfo{
+		Data:       operateEventExt,
+		TotalCount: totalCount,
+	}
+	return pageInfo, err
+}

business/jxstore/misc/misc.go

@@ -6,6 +6,8 @@ import (
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxstore/event"
+
 	"git.rosy.net.cn/jx-callback/business/jxstore/report"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -226,6 +228,8 @@ func doDailyWork() {
 	orderman.RefreshOrdersWithoutJxStoreID(jxcontext.AdminCtx, "", "", true, true)
 	//刷新京东门店的等级
 	cms.RefreshJdLevel(jxcontext.AdminCtx)
+	//删除操作日志
+	event.DeleteOperateEventAndDetail(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -7))
 }
 
 func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) {