diff --git a/platformapi/uuptapi/callback.go b/platformapi/uuptapi/callback.go index e443351b..315659b1 100644 --- a/platformapi/uuptapi/callback.go +++ b/platformapi/uuptapi/callback.go @@ -9,7 +9,7 @@ import ( ) const ( - uuCallbackURL = "https://www.jxc4.com/uuCallback" //uu跑腿订单回调地址 + uuCallbackURL = "http://callback.jxc4.com/UuPt/UuWaybillCallback" //uu跑腿订单回调地址 ) //var ( @@ -42,8 +42,8 @@ func (a *API) WaybillCallback(request *http.Request) (*WaybillCallbackParam, *Ca return nil, Err2CallbackResponse(err) } retVal := WaybillCallbackParam{} - if temp, err := json.Marshal(resp); err == nil { - err = json.Unmarshal(temp, &retVal) + if err := json.Unmarshal(resp, &retVal); err != nil { + return nil, Err2CallbackResponse(err) } con := retVal != WaybillCallbackParam{} if con { diff --git a/platformapi/uuptapi/uupt_test.go b/platformapi/uuptapi/uupt_test.go index b58fbb17..0e4b74a1 100644 --- a/platformapi/uuptapi/uupt_test.go +++ b/platformapi/uuptapi/uupt_test.go @@ -9,7 +9,10 @@ import ( ) var ( - api *API = New("55c4542ae60e4d348edcfc93b06dd302", "76b362c06b1b4baa9e47bab6387a5356", "8d8464e7c9354c1e88a3f5afa2a7922e") + //沙箱环境 + api = New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") + //正式环境 + //api *API = New("55c4542ae60e4d348edcfc93b06dd302", "76b362c06b1b4baa9e47bab6387a5356", "8d8464e7c9354c1e88a3f5afa2a7922e") sugarLogger *zap.SugaredLogger ) @@ -53,10 +56,45 @@ func TestGetWaybillPrice(t *testing.T) { FromLng: "104.04546", } price := utils.Struct2Map(param, "", false) - needPayMoney, priceToken, err := api.GetOrderPrice(price) - fmt.Println(needPayMoney, priceToken, err) + resp, err := api.GetOrderPrice(price) + fmt.Println(utils.Format4Output(resp, false)) + fmt.Println(err) } +//发布订单 +func TestAddOrder(t *testing.T) { + param := &AddOrderReq{ + PriceToken: "7cef537722d647afa2274563cc886812", + OrderPrice: "10.00", + BalancePayMoney: "10.00", + Receiver: "测试订单", + ReceiverPhone: "15680424816,9776", + CallbackUrl: uuCallbackURL, + PushType: "2", //测试订单 + SpecialType: "0", + CallMeWithTake: "0", + } + order := utils.Struct2Map(param, "", false) + orderCode, originID, err := api.AddOrder(order) + fmt.Println("orderCode=====", orderCode) + fmt.Println("originID=====", originID) + fmt.Println("err=======", err) +} + +//获取订单详情 +func TestGetOrderDetail(t *testing.T) { + detail, err := api.GetOrderDetail("230128143210047000011744") + fmt.Println(utils.Format4Output(detail, false)) + fmt.Println(err) +} + +//取消订单 +func TestCancelOrder(t *testing.T) { + err := api.CancelOrder("230128143210047000011744", "测试取消") + fmt.Println(err) +} + +//辅助测试 type tStruct struct { name string } diff --git a/platformapi/uuptapi/uuptapi.go b/platformapi/uuptapi/uuptapi.go index d2c23ca9..d3d7cc3b 100644 --- a/platformapi/uuptapi/uuptapi.go +++ b/platformapi/uuptapi/uuptapi.go @@ -13,8 +13,9 @@ import ( ) const ( - BaseURL = "https://openapi.uupt.com/v2_0" - ReturnSuccess = "ok" //返回成功 + //BaseURL = "https://openapi.uupt.com/v2_0" //正式环境 + BaseURL = "http://openapi.test.uupt.com/v2_0/" //沙箱环境测试 + ReturnSuccess = "ok" //返回成功 ReturnSuccessMsg = "callbackSuccess" ReturnFail = "fail" //返回失败 signKey = "sign"