From fc82933437251b99c4fdf7f28d341f155e781ff5 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 17:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 1cb9e76ce..5c310112d 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1109,7 +1109,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 		}()
 		if err = dao.CreateEntity(db, storeMap); err == nil {
 			if globals.IsAddEvent {
-				err = AddEventDetail(db, ctx, model.OperateAdd, storeID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
+				err = AddEventDetail(db, ctx, model.OperateAdd, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
 			}
 			dao.Commit(db)
 			outStoreMap = storeMap
@@ -1138,7 +1138,7 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 			model.FieldStatus: model.StoreStatusDisabled,
 		}, userName, nil)
 		if globals.IsAddEvent {
-			err = AddEventDetail(db, ctx, model.OperateDelete, storeID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
+			err = AddEventDetail(db, ctx, model.OperateDelete, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
 		}
 	}
 	return num, err
@@ -1179,6 +1179,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 	if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err != nil {
 		return 0, err
 	}
+	var beforeStoreMap = *storeMap
 	syncStatus := model.SyncFlagModifiedMask
 	valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName)
 	if valid["status"] != nil {
@@ -1246,6 +1247,10 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 				return 0, err
 			}
 			if num > 0 {
+				if globals.IsAddEvent {
+					mapBefore := refutil.FindMapAndStructMixed(valid, beforeStoreMap)
+					err = AddEventDetail(db, ctx, model.OperateUpdate, vendorID, model.ThingTypeStore, storeID, BuildDiffData(mapBefore), BuildDiffData(valid))
+				}
 				if vendorID != model.VendorIDJX {
 					if valid["pricePercentage"] != nil || valid["pricePercentagePack"] != nil {
 						storeSkuBind := &model.StoreSkuBind{}