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

操作日志增加开关

Browse Source
This commit is contained in:
苏尹岚
2020-01-15 08:51:41 +08:00
parent 1b9921c387
commit 59ffb8838f
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1039,7 +1039,9 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
if tmpStatus := getSkuSaleStatus(inSkuBind, skuBindInfo); tmpStatus != model.StoreSkuBindStatusNA { if tmpStatus := getSkuSaleStatus(inSkuBind, skuBindInfo); tmpStatus != model.StoreSkuBindStatusNA {
skuBind.Status = tmpStatus 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) setStoreSkuBindStatus(skuBind, model.SyncFlagNewMask)
dao.WrapAddIDCULDEntity(skuBind, userName) dao.WrapAddIDCULDEntity(skuBind, userName)
// globals.SugarLogger.Debug(utils.Format4Output(skuBind, false)) // globals.SugarLogger.Debug(utils.Format4Output(skuBind, false))
@@ -1066,7 +1068,9 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
beforeMsg := *v beforeMsg := *v
skuBind = &v.StoreSkuBind skuBind = &v.StoreSkuBind
if skuBindInfo.IsFocus == -1 && isCanChangePrice { 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{}{ if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{
model.FieldStatus: model.StoreSkuBindStatusDeleted, model.FieldStatus: model.StoreSkuBindStatusDeleted,
model.FieldJdSyncStatus: model.SyncFlagDeletedMask, model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
@@ -1120,12 +1124,14 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd
} }
} }
if len(updateFieldMap) > 0 { if globals.IsAddEvent {
mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind) if len(updateFieldMap) > 0 {
afterData := utils.MustMarshal(mapAfter) mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind)
mapBefore := refutil.FindMapAndStructMixed(updateFieldMap, beforeMsg) afterData := utils.MustMarshal(mapAfter)
beforeData := utils.MustMarshal(mapBefore) mapBefore := refutil.FindMapAndStructMixed(updateFieldMap, beforeMsg)
err = AddEventDetail(model.OperateUpdate, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), string(beforeData), string(afterData)) beforeData := utils.MustMarshal(mapBefore)
err = AddEventDetail(model.OperateUpdate, v.RealSkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), string(beforeData), string(afterData))
}
} }
if len(updateFieldMap) > 0 { if len(updateFieldMap) > 0 {
updateFieldMap[model.FieldJdSyncStatus] = 1 updateFieldMap[model.FieldJdSyncStatus] = 1
@@ -1254,14 +1260,16 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind
} else { } else {
status = model.StoreSkuBindStatusNormal status = model.StoreSkuBindStatusNormal
} }
if status != statusResult { if globals.IsAddEvent {
mapAfter := make(map[string]interface{}) if status != statusResult {
mapAfter["Status"] = status mapAfter := make(map[string]interface{})
afterData := utils.MustMarshal(mapAfter) mapAfter["Status"] = status
mapBefore := make(map[string]interface{}) afterData := utils.MustMarshal(mapAfter)
mapBefore["Status"] = statusResult mapBefore := make(map[string]interface{})
beforeData := utils.MustMarshal(mapBefore) mapBefore["Status"] = statusResult
err = AddEventDetail(model.OperateUpdate, v.SkuID, model.ThingTypeSku, storeID, ctx.GetTrackInfo(), string(beforeData), string(afterData)) 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 { if num, err = dao.UpdateEntityLogically(db, skuBind, kvs, userName, nil); err != nil {
dao.Rollback(db) 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) globals.SugarLogger.Debugf("CopyStoreSkus fromStoreID:%d, toStoreID:%d, trackInfo:%s num3:%d", fromStoreID, toStoreID, ctx.GetTrackInfo(), num2)
dao.Commit(db) dao.Commit(db)
} }
mapAfter := make(map[string]interface{}) if globals.IsAddEvent {
mapAfter["ToStoreIDs"] = toStoreIDs mapAfter := make(map[string]interface{})
mapAfter["CopyMode"] = copyMode mapAfter["ToStoreIDs"] = toStoreIDs
mapAfter["IsScale"] = isScale mapAfter["CopyMode"] = copyMode
afterData := utils.MustMarshal(mapAfter) mapAfter["IsScale"] = isScale
mapBefore := make(map[string]interface{}) afterData := utils.MustMarshal(mapAfter)
mapBefore["FromStoreID"] = fromStoreID mapBefore := make(map[string]interface{})
beforeData := utils.MustMarshal(mapBefore) mapBefore["FromStoreID"] = fromStoreID
err = AddEventDetail(model.OperateCopyStoreSkus, 0, model.ThingTypeSku, fromStoreID, ctx.GetTrackInfo(), string(beforeData), string(afterData)) beforeData := utils.MustMarshal(mapBefore)
err = AddEventDetail(model.OperateCopyStoreSkus, 0, model.ThingTypeSku, fromStoreID, ctx.GetTrackInfo(), string(beforeData), string(afterData))
}
return num, errList.GetErrListAsOne() return num, errList.GetErrListAsOne()
} }

1
conf/app.conf
View File

@@ -106,6 +106,7 @@ getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
storeName = "京西菜市" storeName = "京西菜市"
useThingMap = true useThingMap = true
addEvent = false
[dev] [dev]
jdOrgCode = "320406" jdOrgCode = "320406"

2
globals/globals.go
View File

@@ -49,6 +49,7 @@ var (
IsUseThingMap bool IsUseThingMap bool
IsStoreSkuAct bool IsStoreSkuAct bool
IsAddEvent bool
OutputDebugMsgLevel int OutputDebugMsgLevel int
) )
@@ -106,6 +107,7 @@ func Init() {
Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "") Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "")
IsUseThingMap = beego.AppConfig.DefaultBool("useThingMap", false) IsUseThingMap = beego.AppConfig.DefaultBool("useThingMap", false)
IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
IsStoreSkuAct = false IsStoreSkuAct = false
} }