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