From bf11bfb6bd4c9daf9f26ea4ef4ca15a2414ef31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 18 Aug 2023 09:44:18 +0800 Subject: [PATCH] 1 --- platformapi/mtwmapi/mtwmapi_test.go | 6 +++--- platformapi/mtwmapi/poi_test.go | 4 ++-- platformapi/tao_vegetable/order_delivery.go | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index d60e8dc6..5fd10b7d 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_r-gsHtjKjgxMhYcxeWpPKg") //token_n4TwqCntWWuvQwAawzxC0w + //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_r-gsHtjKjgxMhYcxeWpPKg") //token_n4TwqCntWWuvQwAawzxC0w cookieStr := ` acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; ` @@ -64,7 +64,7 @@ func TestGetAccessToken(t *testing.T) { } func TestGetAccessToken2(t *testing.T) { - result, err := api.GetAccessToken2("18574879") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg + result, err := api.GetAccessToken2("18830143") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/poi_test.go b/platformapi/mtwmapi/poi_test.go index f619720b..02d47746 100644 --- a/platformapi/mtwmapi/poi_test.go +++ b/platformapi/mtwmapi/poi_test.go @@ -44,10 +44,10 @@ func TestPoiSave(t *testing.T) { //} poiParams := map[string]interface{}{} //utils.FilterMapNilMembers(utils.Struct2FlatMap(result[0])) - poiParams["address"] = "云南省楚雄彝族自治州楚雄市东瓜镇高新区永安路1号四季银座花园城6栋6-4" + poiParams["address"] = "北京市朝阳区百子湾路32号院6号楼-1层C3-1号" //poiParams["pic_url"] = "http://image.jxc4.com/image/5c9fc4fffb4d5ff1aecf85a2d2543e00.jpg" //poiParams["name"] = "京西菜市（礼嘉桥村市场店）" - err := api.PoiSave("15467875", poiParams) + err := api.PoiSave("18830143", poiParams) fmt.Println(err) } diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go index fd2b095b..4e107fb6 100644 --- a/platformapi/tao_vegetable/order_delivery.go +++ b/platformapi/tao_vegetable/order_delivery.go @@ -6,6 +6,8 @@ import ( "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain" request2 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request" + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" "io/ioutil" "net/http" ) @@ -42,16 +44,16 @@ func (a *API) QueryOrderDetail(req *request2.AlibabaAelophyOrderGetRequest) (*do // DeliveryFinish 订单一下的没一个状态通知接口 // ACCEPTED = 商户接单 REJECTED = 商户取消订单 PICKED = 拣货完成 PACKAGED = 打包出库 SHIPPING = 开始配送 SIGN = 用户签收 REFUSED = 用户拒收 func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackRequest) error { - //globals.SugarLogger.Debugf("进入 DeliveryFinish: %s", utils.Format4Output(req, false)) + globals.SugarLogger.Debugf("进入 DeliveryFinish: %s", utils.Format4Output(req, false)) client := ability591.NewAbility591(&a.client) - //globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false)) + globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false)) data, _ := client.AlibabaAelophyOrderWorkCallback(req, a.token) if data != nil && !*data.ApiResult.Success { //globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.ApiResult.ErrMsg) } - //globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) + globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) return nil }