From 9b34fd5e41cf0cbe7212dc4fc216abc84fdde62d Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 27 Jun 2018 15:43:41 +0800 Subject: [PATCH] - use request body when handling jd msg. - when check pending jd order msg, limit to 2days --- business/jd/controller/order.go | 2 +- controllers/jd_order.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jd/controller/order.go b/business/jd/controller/order.go index e5184ae46..1df24374b 100644 --- a/business/jd/controller/order.go +++ b/business/jd/controller/order.go @@ -38,7 +38,7 @@ func InitOrder() { func handlePendingOrderMsg() { var ordersInfo []models.Jdorder db := orm.NewOrm() - _, err := db.Raw("SELECT * FROM jdorder WHERE code = ?", MsgNotHandledCode).QueryRows(&ordersInfo) + _, err := db.Raw("SELECT * FROM jdorder WHERE orderstatustime >= DATE_ADD(NOW(), interval -2 day) AND code = ?", MsgNotHandledCode).QueryRows(&ordersInfo) if err != nil { globals.SugarLogger.Errorf("can not get jdorder from db, error:%v", err) } else { diff --git a/controllers/jd_order.go b/controllers/jd_order.go index 02b9f9823..94ca380cf 100644 --- a/controllers/jd_order.go +++ b/controllers/jd_order.go @@ -24,7 +24,7 @@ func (c *JDOrderController) URLMapping() { } func (c *JDOrderController) orderStatus() { - obj, callbackResponse := globals2.Jdapi.GetOrderCallbackMsg(c.Ctx.Request) + obj, callbackResponse := globals2.Jdapi.GetOrderCallbackMsg(c.Ctx.Input.RequestBody) if callbackResponse == nil { cc := controller.OrderController{} callbackResponse = cc.OrderStatus(obj) @@ -120,7 +120,7 @@ func (c *JDOrderController) UserCancelOrder() { // @Failure 403 body is empty // @router /applyCancelOrder [post] func (c *JDOrderController) ApplyCancelOrder() { - obj, callbackResponse := globals2.Jdapi.GetOrderApplyCancelCallbackMsg(c.Ctx.Request) + obj, callbackResponse := globals2.Jdapi.GetOrderApplyCancelCallbackMsg(c.Ctx.Input.RequestBody) if callbackResponse == nil { cc := controller.OrderController{} callbackResponse = cc.OrderStatus(obj) @@ -136,7 +136,7 @@ func (c *JDOrderController) ApplyCancelOrder() { // @Failure 403 body is empty // @router /pushDeliveryStatus [post] func (c *JDOrderController) PushDeliveryStatus() { - obj, callbackResponse := globals2.Jdapi.GetOrderDeliveryCallbackMsg(c.Ctx.Request) + obj, callbackResponse := globals2.Jdapi.GetOrderDeliveryCallbackMsg(c.Ctx.Input.RequestBody) if callbackResponse == nil { cc := controller.OrderController{} callbackResponse = cc.OrderDeliveryStatus(obj)