liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- token.

Browse Source 
- don't treat DeliveryStatusFailedGetGoods as failed delivery(jd).
This commit is contained in:
gazebo
2018-08-23 15:05:04 +08:00
parent 471007a7e9
commit d4de5b4caf
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/purchase/jd/waybill.go
View File

@@ -38,7 +38,7 @@ func (c *PurchaseHandler) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (re
order.Status = model.WaybillStatusDelivering order.Status = model.WaybillStatusDelivering
case jdapi.DeliveryStatusFinished: case jdapi.DeliveryStatusFinished:
order.Status = model.WaybillStatusDelivered order.Status = model.WaybillStatusDelivered
case jdapi.DeliveryStatusFailedDelivery, jdapi.DeliveryStatusFailedGetGoods: case jdapi.DeliveryStatusFailedDelivery: //, jdapi.DeliveryStatusFailedGetGoods: todo 取货失败不当成投递失败
order.Status = model.WaybillStatusFailed order.Status = model.WaybillStatusFailed
default: default:
order.Status = model.WaybillStatusUnknown order.Status = model.WaybillStatusUnknown

16
controllers/jx_order.go
View File

@@ -134,13 +134,14 @@ func (c *OrderController) CreateWaybillOnProviders() {
// @router /GetStoreOrderCountInfo [get] // @router /GetStoreOrderCountInfo [get]
func (c *OrderController) GetStoreOrderCountInfo() { func (c *OrderController) GetStoreOrderCountInfo() {
var ( var (
storeID string storeID, token string
lastHours int lastHours int
err error err error
) )
token = c.Ctx.Input.Header("token")
storeID = c.GetString("storeID") storeID = c.GetString("storeID")
lastHours, err1 := c.GetInt("lastHours", 0) lastHours, err1 := c.GetInt("lastHours", 0)
if storeID != "" && err1 == nil { if token != "" && storeID != "" && err1 == nil {
result, err2 := orderman.FixedOrderManager.GetStoreOrderCountInfo(storeID, lastHours) result, err2 := orderman.FixedOrderManager.GetStoreOrderCountInfo(storeID, lastHours)
if err = err2; err == nil { if err = err2; err == nil {
c.Data["json"] = &model.CallResult{ c.Data["json"] = &model.CallResult{
@@ -150,6 +151,9 @@ func (c *OrderController) GetStoreOrderCountInfo() {
} }
} }
errMsg := jxutils.Errs2Str("", err1, err) errMsg := jxutils.Errs2Str("", err1, err)
if token == "" {
errMsg += "token is empty\n"
}
if storeID == "" { if storeID == "" {
errMsg += "storeID is empty\n" errMsg += "storeID is empty\n"
} }
@@ -176,10 +180,11 @@ func (c *OrderController) GetStoreOrderCountInfo() {
// @router /GetStoreOrderInfo [get] // @router /GetStoreOrderInfo [get]
func (c *OrderController) GetStoreOrderInfo() { func (c *OrderController) GetStoreOrderInfo() {
var ( var (
storeID string storeID, token string
lastHours, fromStatus, toStatus, offset, pageSize int lastHours, fromStatus, toStatus, offset, pageSize int
err error err error
) )
token = c.Ctx.Input.Header("token")
storeID = c.GetString("storeID") storeID = c.GetString("storeID")
lastHours, err1 := c.GetInt("lastHours", 0) lastHours, err1 := c.GetInt("lastHours", 0)
fromStatus, err2 := c.GetInt("fromStatus", 0) fromStatus, err2 := c.GetInt("fromStatus", 0)
@@ -187,7 +192,7 @@ func (c *OrderController) GetStoreOrderInfo() {
offset, err4 := c.GetInt("offset", 0) offset, err4 := c.GetInt("offset", 0)
pageSize, err5 := c.GetInt("pageSize", 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) result, err2 := orderman.FixedOrderManager.GetStoreOrderInfo(storeID, lastHours, fromStatus, toStatus, offset, pageSize)
if err = err2; err == nil { if err = err2; err == nil {
c.Data["json"] = &model.CallResult{ c.Data["json"] = &model.CallResult{
@@ -197,6 +202,9 @@ func (c *OrderController) GetStoreOrderInfo() {
} }
} }
errMsg := jxutils.Errs2Str("", err1, err2, err3, err) errMsg := jxutils.Errs2Str("", err1, err2, err3, err)
if token == "" {
errMsg += "token is empty\n"
}
if storeID == "" { if storeID == "" {
errMsg += "storeID is empty\n" errMsg += "storeID is empty\n"
} }