From 59ffb8838f60687f1558aab1ff5c847b1d0bcabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 15 Jan 2020 08:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 60 ++++++++++++++++++------------- conf/app.conf | 1 + globals/globals.go | 2 ++ 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index b4b704894..833e392b1 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1039,7 +1039,9 @@ 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(), "", "") + if globals.IsAddEvent { + 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)) @@ -1066,7 +1068,9 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs beforeMsg := *v skuBind = &v.StoreSkuBind if skuBindInfo.IsFocus == -1 && isCanChangePrice { - err = AddEventDetail(model.OperateDelete, skuBind.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), "", "") + if globals.IsAddEvent { + 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, @@ -1120,12 +1124,14 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd } } - 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 globals.IsAddEvent { + 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 @@ -1254,14 +1260,16 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind } 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 globals.IsAddEvent { + 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) @@ -1578,15 +1586,17 @@ 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)) + if globals.IsAddEvent { + 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() } diff --git a/conf/app.conf b/conf/app.conf index 634f31a02..f4b1a890a 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -106,6 +106,7 @@ getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f" storeName = "京西菜市" useThingMap = true +addEvent = false [dev] jdOrgCode = "320406" diff --git a/globals/globals.go b/globals/globals.go index 39f1b31f7..a6cf4f283 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -49,6 +49,7 @@ var ( IsUseThingMap bool IsStoreSkuAct bool + IsAddEvent bool OutputDebugMsgLevel int ) @@ -106,6 +107,7 @@ func Init() { Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "") IsUseThingMap = beego.AppConfig.DefaultBool("useThingMap", false) + IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false) IsStoreSkuAct = false }