Accept Merge Request #154: (su -> mark)

Merge Request: 订单查看顾客信息取消次数
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/154

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()	
+		 WHERE a.vendor_user_id = (SELECT vendor_user_id FROM goods_order WHERE vendor_order_id = ?)
-		  AND 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 {

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(),

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() {
+
+}

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()
 }