diff --git a/platformapi/lakala/lakala_api.go b/platformapi/lakala/lakala_api.go index 62876465..f9197b6b 100644 --- a/platformapi/lakala/lakala_api.go +++ b/platformapi/lakala/lakala_api.go @@ -49,7 +49,9 @@ func New(appID, serialNo, sM4Key, clientId, clientSecret, incomingToken, changeT // AccessAPI form表单格式 func (a *API) AccessAPI(baseUrl, action, method string, pathParam string, bizParams map[string]interface{}) (retVal map[string]interface{}, err error) { - a.CheckToken() + if method != TokenActive { + a.CheckToken() + } err = platformapi.AccessPlatformAPIWithRetry(a.client, func() *http.Request { var request *http.Request diff --git a/platformapi/lakala/lakala_token_test.go b/platformapi/lakala/lakala_token_test.go index bdbcdc5a..9d0e3e63 100644 --- a/platformapi/lakala/lakala_token_test.go +++ b/platformapi/lakala/lakala_token_test.go @@ -40,7 +40,7 @@ func TestModifiedToken(t *testing.T) { // TestOrganization 获取城市组织代码 func TestOrganization(t *testing.T) { // 6510 成都市 6515 金牛 - organizationList, err := api.GetOrganizationCode("6510") + organizationList, err := api.GetOrganizationCode("1") if err != nil { globals.SugarLogger.Debugf("err := %v", err) } else { diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 763229dd..d498de3f 100644 --- a/platformapi/mtwmapi/mtwmapi_test.go +++ b/platformapi/mtwmapi/mtwmapi_test.go @@ -20,13 +20,13 @@ func init() { baseapi.Init(sugarLogger) // 菜市 - //api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "") + api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "") // 果园 //api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") //商超 - api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_oku5J6-UzKWdNwcNdXNOKA") + //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_lfakvRM4GLSa_VLMUIZDHA") //cookieStr := ` // acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; //` diff --git a/platformapi/mtwmapi/order.go b/platformapi/mtwmapi/order.go index 253c8b67..69b3c3a4 100644 --- a/platformapi/mtwmapi/order.go +++ b/platformapi/mtwmapi/order.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "git.rosy.net.cn/baseapi/utils" + "strings" "time" ) @@ -419,6 +420,9 @@ func (a *API) OrderLogisticsChange2Self(orderID int64) (err error) { _, err = a.AccessAPI("order/logistics/change/poi_self", false, map[string]interface{}{ KeyOrderID: orderID, }) + if err != nil && strings.Contains(err.Error(), "您的配送单已取消") { + return nil + } return err } diff --git a/platformapi/mtwmapi/order_test.go b/platformapi/mtwmapi/order_test.go index ac07dd27..026d36b6 100644 --- a/platformapi/mtwmapi/order_test.go +++ b/platformapi/mtwmapi/order_test.go @@ -31,7 +31,7 @@ func getTimeFromTimestamp(timeStamp int64) time.Time { } func TestOrderGetOrderDetail(t *testing.T) { - result, err := api.OrderGetOrderDetail(5401564660946475322, false) + result, err := api.OrderGetOrderDetail(2001664651373743860, false) if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/shipping.go b/platformapi/mtwmapi/shipping.go index 38111cd5..2ae16303 100644 --- a/platformapi/mtwmapi/shipping.go +++ b/platformapi/mtwmapi/shipping.go @@ -28,6 +28,8 @@ const ( PeiSongTypeQiKe = "4015" // 企客远距离配送 PeiSongTypeMixedExpressQiKe = "30012002" // 混合快送 PeiSongTypeFranchise = "30011001" // 混合加盟送 + PeiSongTypeMixedSelf = "30011002" // 混合自建 + PeiSongTypeNewQuik = "1007" // 新快送 ) func (a *API) ShippingSave(poiCode string, area string, minPrice, shippingFee float32) (err error) {