From 0d5494d29def464ad345e4052808d791ee4deff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 16 Jan 2020 11:26:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=92=E9=99=A4Get=E5=BC=80=E5=A4=B4?=
 =?UTF-8?q?=E7=9A=84=E9=9D=9EGet=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/event/event.go |  3 +++
 controllers/event.go            | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 66f67fc8e..8b78a7e24 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -23,6 +23,9 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) {
 	if url != "" {
 		apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)]
 	}
+	if apiFunction[0:2] == "Get" {
+		return err
+	}
 	event := &model.OperateEvent{
 		CreatedAt:    time.Now(),
 		LastOperator: ctx.GetUserName(),
diff --git a/controllers/event.go b/controllers/event.go
index 09cb331a5..87ab75db7 100644
--- a/controllers/event.go
+++ b/controllers/event.go
@@ -35,3 +35,14 @@ func (c *EventController) GetOperateEvents() {
 		return retVal, "", err
 	})
 }
+
+// @Title 各平台Cookie检查
+// @Description 各平台Cookie检查
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorIDs		query		string	false	"平台ID列表"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetCheckVendorCookie [get]
+func (c *EventController) GetCheckVendorCookie() {
+
+}

From 1869e4245e3cea70269357dee490810eacfe6102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 16 Jan 2020 11:58:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 5 ++---
 globals/globals.go                           | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index fce4e5ab1..3d9e7f2f2 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -145,12 +145,11 @@ func (c *OrderManager) GetOrderInfo(ctx *jxcontext.Context, vendorOrderID string
 		    FROM goods_order a 
 			LEFT JOIN afs_order c ON a.vendor_order_id = c.vendor_order_id AND c.vendor_id = a.vendor_id 
 			LEFT JOIN jx_bad_comments d ON d.order_id = a.vendor_order_id AND d.order_flag = a.vendor_id
-		 WHERE a.order_created_at BETWEEN ? AND NOW()	
-		  AND a.vendor_user_id = (SELECT vendor_user_id FROM goods_order WHERE vendor_order_id = ?)
+		 WHERE a.vendor_user_id = (SELECT vendor_user_id FROM goods_order WHERE vendor_order_id = ?)
 		  GROUP BY a.vendor_user_id
 	)t3 ON t3.vendor_user_id = t1.vendor_user_id
 	WHERE t1.vendor_order_id = ? AND vendor_id = ?
-	`, time.Now().AddDate(0, -1, 0), vendorOrderID, vendorOrderID, vendorID).QueryRows(&orders)
+	`, vendorOrderID, vendorOrderID, vendorID).QueryRows(&orders)
 	if err == nil && num > 0 {
 		order = orders[0]
 		if isRefresh && vendorID == model.VendorIDJD {
diff --git a/globals/globals.go b/globals/globals.go
index f21d4f32c..fdd35d17e 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -108,7 +108,7 @@ func Init() {
 
 	IsUseThingMap = beego.AppConfig.DefaultBool("useThingMap", false)
 
-	IsAddEvent = !IsProductEnv()
+	IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
 	IsStoreSkuAct = !IsProductEnv()
 }