|
@@ -128,8 +128,8 @@ public class QiuXiangApi {
|
|
* @param orderRequest 下单请求参数
|
|
* @param orderRequest 下单请求参数
|
|
* @return 订单信息,包含订单ID
|
|
* @return 订单信息,包含订单ID
|
|
*/
|
|
*/
|
|
- public String placeOrder(String token, OrderRequest orderRequest) {
|
|
|
|
- String url = BASE_URL + "/user/order";
|
|
|
|
|
|
+ public JSONObject placeOrder(OrderRequest orderRequest) {
|
|
|
|
+ String url = "/user/order";
|
|
|
|
|
|
JSONObject body = new JSONObject();
|
|
JSONObject body = new JSONObject();
|
|
body.put("adcode", orderRequest.getAdcode());
|
|
body.put("adcode", orderRequest.getAdcode());
|
|
@@ -146,8 +146,7 @@ public class QiuXiangApi {
|
|
}
|
|
}
|
|
|
|
|
|
String result = postRequest(url, body.toString());
|
|
String result = postRequest(url, body.toString());
|
|
- JSONObject json = new JSONObject(result);
|
|
|
|
- return json.toString();
|
|
|
|
|
|
+ return new JSONObject(result);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -158,9 +157,9 @@ public class QiuXiangApi {
|
|
* @param count
|
|
* @param count
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public JSONArray orderList(String lastOrderId, int count) {
|
|
|
|
|
|
+ public JSONArray orderList(String lastOrderId, String count) {
|
|
String url = "/user/order/list";
|
|
String url = "/user/order/list";
|
|
- Map<String, String> orderId1 = Map.of("lastOrderId", lastOrderId, "count", String.valueOf(count));
|
|
|
|
|
|
+ Map<String, String> orderId1 = Map.of("lastOrderId", lastOrderId, "count",count);
|
|
String request = getRequest(url, orderId1);
|
|
String request = getRequest(url, orderId1);
|
|
|
|
|
|
|
|
|
|
@@ -208,10 +207,9 @@ public class QiuXiangApi {
|
|
* @param orderId
|
|
* @param orderId
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public JSONObject driverLocation(String token, String orderId) {
|
|
|
|
|
|
+ public JSONObject driverLocation( String orderId) {
|
|
String url = "/user/order/driver/location";
|
|
String url = "/user/order/driver/location";
|
|
String request = getRequest(url, Map.of("orderId", orderId));
|
|
String request = getRequest(url, Map.of("orderId", orderId));
|
|
-
|
|
|
|
return new JSONObject(request);
|
|
return new JSONObject(request);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -229,8 +227,8 @@ public class QiuXiangApi {
|
|
}
|
|
}
|
|
|
|
|
|
private String getRequest(String url, Map<String, String> params) {
|
|
private String getRequest(String url, Map<String, String> params) {
|
|
-// String phone = authHelper.getCurrentUser().getPhone();
|
|
|
|
- String token = loginUser("13368172379");
|
|
|
|
|
|
+ String phone = authHelper.getCurrentUser().getPhone();
|
|
|
|
+ String token = loginUser(phone);
|
|
String result = HttpRequest.get(BASE_URL + url)
|
|
String result = HttpRequest.get(BASE_URL + url)
|
|
.header("Token", token)
|
|
.header("Token", token)
|
|
.formStr(params)
|
|
.formStr(params)
|
|
@@ -245,8 +243,8 @@ public class QiuXiangApi {
|
|
}
|
|
}
|
|
|
|
|
|
private String deleteRequest(String url, String jsonString) {
|
|
private String deleteRequest(String url, String jsonString) {
|
|
-// String phone = authHelper.getCurrentUser().getPhone();
|
|
|
|
- String token = loginUser("13368172379");
|
|
|
|
|
|
+ String phone = authHelper.getCurrentUser().getPhone();
|
|
|
|
+ String token = loginUser(phone);
|
|
String result = HttpRequest.delete(BASE_URL + url)
|
|
String result = HttpRequest.delete(BASE_URL + url)
|
|
.header("Token", token)
|
|
.header("Token", token)
|
|
.body(jsonString)
|
|
.body(jsonString)
|
|
@@ -263,7 +261,7 @@ public class QiuXiangApi {
|
|
|
|
|
|
private String postRequest(String url, String jsonString) {
|
|
private String postRequest(String url, String jsonString) {
|
|
String phone = authHelper.getCurrentUser().getPhone();
|
|
String phone = authHelper.getCurrentUser().getPhone();
|
|
- String token = loginUser("13368172379");
|
|
|
|
|
|
+ String token = loginUser(phone);
|
|
String result = HttpRequest.post(url)
|
|
String result = HttpRequest.post(url)
|
|
.header("Token", token)
|
|
.header("Token", token)
|
|
.body(jsonString)
|
|
.body(jsonString)
|