From 8436f30eecdb27f64f80d14c145aeb80ad396d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 28 Apr 2020 17:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=96=B0=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 1 + business/partner/partner.go | 3 +++ business/partner/purchase/jd/order.go | 8 ++++++-- controllers/jd_callback.go | 28 +++++++++++++-------------- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index f449f5a95..87aa68a44 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -196,6 +196,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m } func (c *OrderManager) ChangeOrderInfo(order *model.GoodsOrder) (err error) { + return err } diff --git a/business/partner/partner.go b/business/partner/partner.go index af0db010a..3b405db4c 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -46,6 +46,9 @@ type StatusActionParams struct { TimeoutGap int // 以秒为单位的随机时间,0在GetStatusActionConfig返回时表示不修改缺省 } +type OrderInFoChange struct { +} + func (s *StatusActionParams) GetRefTimeout(statusTime time.Time, orderCreatedAt time.Time) (timeout time.Duration) { switch s.TimerType { case TimerTypeBaseNow: diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 41e3393aa..c445f1d6d 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -120,8 +120,12 @@ func (c *PurchaseHandler) OnOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi. } func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.CallbackOrderInfoChangeMsg) (retVal *jdapi.CallbackResponse) { - // a := getAPI(vendorOrgCode) - + a := getAPI(vendorOrgCode) + order, _, err := c.getOrder(a, msg.BillID) + if err == nil { + globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID) + partner.CurOrderManager.ChangeOrderInfo(order) + } return retVal } diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go index 3464acc39..c230f927f 100644 --- a/controllers/jd_callback.go +++ b/controllers/jd_callback.go @@ -217,19 +217,19 @@ func (c *DjswController) OrderAddTips() { c.orderStatus() } -// func (c *DjswController) OrderInfoChange() { -// if c.Ctx.Input.Method() == http.MethodPost { -// callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) { -// callbackResponse = jd.OnOrderInfoChangeMsg(obj.(*jdapi.CallbackOrderInfoChangeMsg)) -// return callbackResponse -// }) -// c.Data["json"] = c.transferResponse("OrderInfoChange", callbackResponse) -// c.ServeJSON() -// } else { -// c.Abort("404") -// } -// } - func (c *DjswController) OrderInfoChange() { - c.orderStatus() + if c.Ctx.Input.Method() == http.MethodPost { + callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) { + callbackResponse = jd.OnOrderInfoChangeMsg(obj.(*jdapi.CallbackOrderInfoChangeMsg)) + return callbackResponse + }) + c.Data["json"] = c.transferResponse("OrderInfoChange", callbackResponse) + c.ServeJSON() + } else { + c.Abort("404") + } } + +// func (c *DjswController) OrderInfoChange() { +// c.orderStatus() +// }