This commit is contained in:
gazebo
2019-05-13 14:01:11 +08:00
parent 9aaf52f35a
commit 64cc7797eb

View File

@@ -19,7 +19,7 @@ import (
var (
VendorStatus2StatusMap = map[string]int{
jdapi.OrderStatusPurchased: model.OrderStatusNew,
jdapi.OrderStatusWaitOutStore: model.OrderStatusNew,
jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted,
jdapi.StatusIDWaitOutStore: model.OrderStatusAccepted,
jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
jdapi.OrderStatusDelivering: model.OrderStatusDelivering,
@@ -47,7 +47,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi
} else if msg.MsgURL == jdapi.CallbackMsgAfterSaleBillStatus {
retVal = c.OnAfsOrderMsg(msg)
} else {
if jdapi.OrderStatusWaitOutStore == msg.StatusID {
if jdapi.StatusIDNewOrder == msg.StatusID {
retVal = c.onOrderNew(msg)
} else if jdapi.OrderStatusAdjust == msg.StatusID {
retVal = c.onOrderAdjust(msg)
@@ -168,7 +168,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) {
order, orderMap, err := c.getOrder(msg.BillID)
if err == nil {
if err = partner.CurOrderManager.OnOrderNew(order, c.callbackMsg2Status(msg)); err == nil {
if err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)); err == nil {
utils.CallFuncAsync(func() {
c.OnOrderDetail(orderMap, partner.CreatedPeration)
})