From 983e4b4218495027eaa5c30fd39da5b64fa1cff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 17 Jan 2020 09:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BA=8B=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=99=A4=E5=A4=96=E7=9A=84=E8=A1=A8=EF=BC=8C=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8E=92=E9=99=A4jxadmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 16 +++++++-------- business/jxstore/event/event.go | 33 +++++++++++++++++-------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 8066837c3..86f19e032 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1040,7 +1040,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind.Status = tmpStatus } 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) dao.WrapAddIDCULDEntity(skuBind, userName) @@ -1069,7 +1069,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind = &v.StoreSkuBind if skuBindInfo.IsFocus == -1 && isCanChangePrice { 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{}{ model.FieldStatus: model.StoreSkuBindStatusDeleted, @@ -1128,7 +1128,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs if len(updateFieldMap) > 0 { mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind) 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 { @@ -1182,17 +1182,17 @@ func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuNameBindInfo *StoreSkuB 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{ OperateType: operateType, ThingID: thingID, ThingType: thingType, StoreID: storeID, - AccessUUID: accessUUID, + AccessUUID: ctx.GetTrackInfo(), BeforeData: beforeData, AfterData: afterData, } - err = event.AddOperateEventDetail(db, operateEventDetail) + err = event.AddOperateEventDetail(db, ctx, operateEventDetail) return err } @@ -1264,7 +1264,7 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind mapAfter["Status"] = status mapBefore := make(map[string]interface{}) 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 { @@ -1594,7 +1594,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, co mapAfter["IsScale"] = isScale mapBefore := make(map[string]interface{}) 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() } diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index f3a986da8..8ed4589d7 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -4,22 +4,22 @@ import ( "strings" "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/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/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 { @@ -37,7 +37,7 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)] } if apiFunction != "" { - if apiFunction[0:3] == "Get" { + if apiFunction[0:3] == "Get" || NoUseEventMap[apiFunction] != "" { return err } } @@ -60,7 +60,10 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) { 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) defer func() { if r := recover(); r != nil {