From 92f00d1d4e706f52bac89d57990ee8382930b3d2 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 13:35:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?cookie=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/event/event.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 91a62c277..81e9277fc 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -127,11 +127,11 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 		errMsg      = ""
 	)
 	for _, v := range vendorIDs {
-		cc := &CheckCookie{}
-		var flag = false
 		appOrgCodeList := apimanager.CurAPIManager.GetAppOrgCodeList(v)
 		if len(appOrgCodeList) > 0 {
 			for _, vv := range appOrgCodeList {
+				cc := &CheckCookie{}
+				var flag = false
 				switch v {
 				case model.VendorIDEBAI:
 					resultMap, err := api.EbaiAPI.GetStoreOrderInfo(ebaiOrderID)
@@ -168,6 +168,8 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 				ccList = append(ccList, cc)
 			}
 		} else {
+			cc := &CheckCookie{}
+			var flag = false
 			if v == model.VendorIDMTPS {
 				err := api.MtpsAPI.GetAccountDetail()
 				if err != nil && strings.Contains(err.Error(), mtpsErr) {

From 8b8bdf2826d569dda4e09cccb7611c8550de5858 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 14:28:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 1071d9435..ca5bc0c21 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -13,6 +13,8 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"git.rosy.net.cn/jx-callback/globals/refutil"
+
 	"github.com/360EntSecGroup-Skylar/excelize"
 
 	"git.rosy.net.cn/baseapi"
@@ -695,6 +697,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 		return 0, err
 	}
 	var outStore *model.Store
+	var beforStore = *store
 	if payload["autoEnableAt"] != nil {
 		payload["autoEnableAt"] = utils.Time2Date(utils.Str2Time(utils.Interface2String(payload["autoEnableAt"])))
 	}
@@ -872,6 +875,10 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 	// }
 	globals.SugarLogger.Debugf("UpdateStore track:%s, storeID:%d, valid:%s", ctx.GetTrackInfo(), storeID, utils.Format4Output(valid, true))
 	if len(valid) > 0 {
+		if globals.IsAddEvent {
+			mapBefore := refutil.FindMapAndStructMixed(valid, beforStore)
+			err = AddEventDetail(db, ctx, model.OperateUpdate, storeID, model.ThingTypeStore, storeID, BuildDiffData(mapBefore), BuildDiffData(valid))
+		}
 		dao.Begin(db)
 		defer func() {
 			dao.Rollback(db)