diff --git a/business/partner/purchase/jd/waybill.go b/business/partner/purchase/jd/waybill.go index b2237bd6f..4386efff5 100644 --- a/business/partner/purchase/jd/waybill.go +++ b/business/partner/purchase/jd/waybill.go @@ -38,7 +38,7 @@ func (c *PurchaseHandler) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (re order.Status = model.WaybillStatusDelivering case jdapi.DeliveryStatusFinished: order.Status = model.WaybillStatusDelivered - case jdapi.DeliveryStatusFailedDelivery, jdapi.DeliveryStatusFailedGetGoods: + case jdapi.DeliveryStatusFailedDelivery: //, jdapi.DeliveryStatusFailedGetGoods: todo 取货失败不当成投递失败 order.Status = model.WaybillStatusFailed default: order.Status = model.WaybillStatusUnknown diff --git a/controllers/jx_order.go b/controllers/jx_order.go index c03648bc4..46250492a 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -134,13 +134,14 @@ func (c *OrderController) CreateWaybillOnProviders() { // @router /GetStoreOrderCountInfo [get] func (c *OrderController) GetStoreOrderCountInfo() { var ( - storeID string - lastHours int - err error + storeID, token string + lastHours int + err error ) + token = c.Ctx.Input.Header("token") storeID = c.GetString("storeID") lastHours, err1 := c.GetInt("lastHours", 0) - if storeID != "" && err1 == nil { + if token != "" && storeID != "" && err1 == nil { result, err2 := orderman.FixedOrderManager.GetStoreOrderCountInfo(storeID, lastHours) if err = err2; err == nil { c.Data["json"] = &model.CallResult{ @@ -150,6 +151,9 @@ func (c *OrderController) GetStoreOrderCountInfo() { } } errMsg := jxutils.Errs2Str("", err1, err) + if token == "" { + errMsg += "token is empty\n" + } if storeID == "" { errMsg += "storeID is empty\n" } @@ -176,10 +180,11 @@ func (c *OrderController) GetStoreOrderCountInfo() { // @router /GetStoreOrderInfo [get] func (c *OrderController) GetStoreOrderInfo() { var ( - storeID string + storeID, token string lastHours, fromStatus, toStatus, offset, pageSize int err error ) + token = c.Ctx.Input.Header("token") storeID = c.GetString("storeID") lastHours, err1 := c.GetInt("lastHours", 0) fromStatus, err2 := c.GetInt("fromStatus", 0) @@ -187,7 +192,7 @@ func (c *OrderController) GetStoreOrderInfo() { offset, err4 := c.GetInt("offset", 0) pageSize, err5 := c.GetInt("pageSize", 0) - if storeID != "" && err1 == nil && err2 == nil && err3 == nil && err4 == nil && err5 == nil { + if token != "" && storeID != "" && err1 == nil && err2 == nil && err3 == nil && err4 == nil && err5 == nil { result, err2 := orderman.FixedOrderManager.GetStoreOrderInfo(storeID, lastHours, fromStatus, toStatus, offset, pageSize) if err = err2; err == nil { c.Data["json"] = &model.CallResult{ @@ -197,6 +202,9 @@ func (c *OrderController) GetStoreOrderInfo() { } } errMsg := jxutils.Errs2Str("", err1, err2, err3, err) + if token == "" { + errMsg += "token is empty\n" + } if storeID == "" { errMsg += "storeID is empty\n" }