From 8e881edd54f1e0299fab4cf85ad613da34a0e11f Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Fri, 26 Jan 2024 16:38:21 +0100 Subject: [PATCH] Add allstatus parameter when platformIds field is present in Mabang requests --- .../api/mabang/getorderlist/OrderListRequestBody.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderListRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderListRequestBody.java index fc560dc76..2156bf636 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderListRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderListRequestBody.java @@ -22,6 +22,8 @@ public class OrderListRequestBody implements RequestBody { private String cursor = ""; private Integer page = 1; private boolean hasNext = true; + // 1.Orders of any status 2.Default value, must set status + private final static String ALL = "1"; @Override public String api() { @@ -31,7 +33,11 @@ public class OrderListRequestBody implements RequestBody { @Override public JSONObject parameters() { JSONObject json = new JSONObject(); - putNonNull(json, "status", status, OrderStatus::getCode); + if (platformOrderIds != null) { + putNonNull(json, "allstatus", ALL); + } else { + putNonNull(json, "status", status, OrderStatus::getCode); + } putNonNull(json, "platformOrderIds", platformOrderIds, (ids) -> String.join(",", ids)); if(datetimeType != null && platformOrderIds == null){ putNonNull(json, datetimeType.text() + "Start", startDate, formatter::format);