diff --git a/platformapi/jdapi/order.go b/platformapi/jdapi/order.go index 5fa8b0d8..bb6a4116 100644 --- a/platformapi/jdapi/order.go +++ b/platformapi/jdapi/order.go @@ -47,7 +47,7 @@ func (a API) QuerySingleOrder(orderId string) (map[string]interface{}, error) { jdParams := make(map[string]interface{}) jdParams["orderId"] = orderId result, err := a.AccessAPIHavePage("order/es/query", jdParams, nil, nil, nil) - if err == nil { + if err != nil { return nil, err } return result[0].(map[string]interface{}), nil diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go index 75dc3e42..00628f62 100644 --- a/platformapi/mtpsapi/mtpsapi.go +++ b/platformapi/mtpsapi/mtpsapi.go @@ -29,6 +29,20 @@ const ( OrderStatusCanceled = 99 ) +const ( + OrderExceptCodePhonePoweroff = 10001 + OrderExceptCodePhoneSuspended = 10002 + OrderExceptCodePhoneNobody = 10003 + OrderExceptCodePhoneEmpty = 10004 + OrderExceptCodePhoneWrong = 10005 + OrderExceptCodePhoneOther = 10006 + OrderExceptCodeAddressWrong = 10101 + OrderExceptCodeAddressOutOfService = 10201 + OrderExceptCodeUserReject = 10202 + OrderExceptCodeUserRequestDelay = 10203 + OrderExceptCodeStoreClosed = 10401 +) + const ( DeliveryServiceCodeRapid = 4011 DeliveryServiceCodeIntime = 4012 diff --git a/utils/utils.go b/utils/utils.go index cea9d0bf..b627936c 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -236,6 +236,13 @@ func MustInterface2Float64(data interface{}) float64 { return retVal } +func Interface2String(data interface{}) string { + if data == nil { + return "" + } + return data.(string) +} + func MergeMaps(firstMap map[string]interface{}, otherMaps ...map[string]interface{}) (retVal map[string]interface{}) { retVal = make(map[string]interface{}) allMaps := append(otherMaps, firstMap) @@ -256,6 +263,17 @@ func CallFuncLogError(funcToCall func() error, msg string) error { return err } +func CallFuncAsync(funcToCall func()) { + go func() { + defer func() { + if r := recover(); r != nil { + baseapi.SugarLogger.Errorf("error when calling func:%v, r:%v", funcToCall, r) + } + }() + funcToCall() + }() +} + func Params2Map(key1, value1 interface{}, kv ...interface{}) (retVal map[string]interface{}) { retVal = make(map[string]interface{}) retVal[key1.(string)] = value1