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

记录事件增加除外的表，明细排除jxadmin

Browse Source
This commit is contained in:
苏尹岚
2020-01-17 09:07:47 +08:00
parent ecb1b12525
commit 983e4b4218
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
business/jxstore/cms/store_sku.go
View File

@@ -1040,7 +1040,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind.Status = tmpStatus skuBind.Status = tmpStatus
} }
if globals.IsAddEvent { if globals.IsAddEvent {
err = AddEventDetail(db, model.OperateAdd, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "") err = AddEventDetail(db, ctx, model.OperateAdd, v.RealSkuID, model.ThingTypeSku, storeID, "", "")
} }
setStoreSkuBindStatus(skuBind, model.SyncFlagNewMask) setStoreSkuBindStatus(skuBind, model.SyncFlagNewMask)
dao.WrapAddIDCULDEntity(skuBind, userName) dao.WrapAddIDCULDEntity(skuBind, userName)
@@ -1069,7 +1069,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind = &v.StoreSkuBind skuBind = &v.StoreSkuBind
if skuBindInfo.IsFocus == -1 && isCanChangePrice { if skuBindInfo.IsFocus == -1 && isCanChangePrice {
if globals.IsAddEvent { if globals.IsAddEvent {
err = AddEventDetail(db, model.OperateDelete, skuBind.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "") err = AddEventDetail(db, ctx, model.OperateDelete, skuBind.SkuID, model.ThingTypeSku, storeID, "", "")
} }
if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{ if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{
model.FieldStatus: model.StoreSkuBindStatusDeleted, model.FieldStatus: model.StoreSkuBindStatusDeleted,
@@ -1128,7 +1128,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
if len(updateFieldMap) > 0 { if len(updateFieldMap) > 0 {
mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind) mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind)
mapBefore := refutil.FindMapAndStructMixed(updateFieldMap, beforeMsg) mapBefore := refutil.FindMapAndStructMixed(updateFieldMap, beforeMsg)
err = AddEventDetail(db, model.OperateUpdate, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), BuildDiffData(mapBefore), BuildDiffData(mapAfter)) err = AddEventDetail(db, ctx, model.OperateUpdate, v.RealSkuID, model.ThingTypeSku, storeID, BuildDiffData(mapBefore), BuildDiffData(mapAfter))
} }
} }
if len(updateFieldMap) > 0 { if len(updateFieldMap) > 0 {
@@ -1182,17 +1182,17 @@ func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuNameBindInfo *StoreSkuB
return model.StoreSkuBindStatusNA return model.StoreSkuBindStatusNA
} }
func AddEventDetail(db *dao.DaoDB, operateType, thingID, thingType, storeID int, accessUUID, beforeData, afterData string) (err error) { func AddEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateType, thingID, thingType, storeID int, beforeData, afterData string) (err error) {
operateEventDetail := &model.OperateEventDetail{ operateEventDetail := &model.OperateEventDetail{
OperateType: operateType, OperateType: operateType,
ThingID: thingID, ThingID: thingID,
ThingType: thingType, ThingType: thingType,
StoreID: storeID, StoreID: storeID,
AccessUUID: accessUUID, AccessUUID: ctx.GetTrackInfo(),
BeforeData: beforeData, BeforeData: beforeData,
AfterData: afterData, AfterData: afterData,
} }
err = event.AddOperateEventDetail(db, operateEventDetail) err = event.AddOperateEventDetail(db, ctx, operateEventDetail)
return err return err
} }
@@ -1264,7 +1264,7 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind
mapAfter["Status"] = status mapAfter["Status"] = status
mapBefore := make(map[string]interface{}) mapBefore := make(map[string]interface{})
mapBefore["Status"] = statusResult mapBefore["Status"] = statusResult
err = AddEventDetail(db, model.OperateUpdate, v.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), BuildDiffData(mapBefore), BuildDiffData(mapAfter)) err = AddEventDetail(db, ctx, model.OperateUpdate, v.SkuID, model.ThingTypeSku, storeID, BuildDiffData(mapBefore), BuildDiffData(mapAfter))
} }
} }
if num, err = dao.UpdateEntityLogically(db, skuBind, kvs, userName, nil); err != nil { if num, err = dao.UpdateEntityLogically(db, skuBind, kvs, userName, nil); err != nil {
@@ -1594,7 +1594,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, co
mapAfter["IsScale"] = isScale mapAfter["IsScale"] = isScale
mapBefore := make(map[string]interface{}) mapBefore := make(map[string]interface{})
mapBefore["FromStoreID"] = fromStoreID mapBefore["FromStoreID"] = fromStoreID
err = AddEventDetail(db, model.OperateCopyStoreSkus, 0, model.ThingTypeSku, fromStoreID, ctx.GetTrackInfo(), BuildDiffData(mapBefore), BuildDiffData(mapAfter)) err = AddEventDetail(db, ctx, model.OperateCopyStoreSkus, 0, model.ThingTypeSku, fromStoreID, BuildDiffData(mapBefore), BuildDiffData(mapAfter))
} }
return num, errList.GetErrListAsOne() return num, errList.GetErrListAsOne()
} }

33
business/jxstore/event/event.go
View File

@@ -4,22 +4,22 @@ import (
"strings" "strings"
"time" "time"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "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"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
)
var (
NoUseEventMap = map[string]string{
"CreateQrOrBarCode": "CreateQrOrBarCode",
"StatisticsReportForOrders": "StatisticsReportForOrders",
}
) )
type CheckCookie struct { type CheckCookie struct {
@@ -37,7 +37,7 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) {
apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)] apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)]
} }
if apiFunction != "" { if apiFunction != "" {
if apiFunction[0:3] == "Get" { if apiFunction[0:3] == "Get" || NoUseEventMap[apiFunction] != "" {
return err return err
} }
} }
@@ -60,7 +60,10 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) {
return err return err
} }
func AddOperateEventDetail(db *dao.DaoDB, operateEventDetail *model.OperateEventDetail) (err error) { func AddOperateEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateEventDetail *model.OperateEventDetail) (err error) {
if ctx.GetUserName() == "jxadmin" {
return err
}
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {