diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/orderDoOrderAbnormal/OrderSuspendRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/orderDoOrderAbnormal/OrderSuspendRequestBody.java index ba95beaba..0d64d5ca9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/orderDoOrderAbnormal/OrderSuspendRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/orderDoOrderAbnormal/OrderSuspendRequestBody.java @@ -13,13 +13,15 @@ import java.util.function.Function; public class OrderSuspendRequestBody implements RequestBody { private String platformOrderId; - private String abnormal_label_name = "客户要求暂时不处理"; + private String abnormalLabelName; private String description; - public OrderSuspendRequestBody(String platformOrderId, String description) { + public OrderSuspendRequestBody(String platformOrderId, String abnormalLabelName, String description) { this.platformOrderId = platformOrderId; + this.abnormalLabelName = abnormalLabelName; this.description = description; } + @Override public String api() { return "order-do-order-abnormal"; @@ -29,8 +31,8 @@ public class OrderSuspendRequestBody implements RequestBody { public Map parameters() { JSONObject json = new JSONObject(); putNonNull(json, "platformOrderId", platformOrderId); - putNonNull(json, "abnormal_label_name", abnormal_label_name); - putNonNull(json, "description", description); + putNonNull(json, "abnormal_label_name", abnormalLabelName); + putNonNull(json, "descr", description); return json; } private void putNonNull(JSONObject json, String key, E value) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ChangeWarehouseJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ChangeWarehouseJob.java index 6fe18bd16..17c6ecbd7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ChangeWarehouseJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ChangeWarehouseJob.java @@ -158,8 +158,7 @@ public class ChangeWarehouseJob implements Job { Responses responses = new Responses(); List> abnormalFutures = ordersToSetAbnormal.stream() .map(id -> CompletableFuture.supplyAsync(() -> { - OrderSuspendRequestBody body = new OrderSuspendRequestBody(id, ""); - body.setAbnormal_label_name(DEFAULT_ABNORMAL_LABEL_NAME); + OrderSuspendRequestBody body = new OrderSuspendRequestBody(id, DEFAULT_ABNORMAL_LABEL_NAME, ""); OrderSuspendRequest request = new OrderSuspendRequest(body); OrderSuspendResponse response = request.send(); Responses r = new Responses(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderMabangServiceImpl.java index 61845e741..c88104dd6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderMabangServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderMabangServiceImpl.java @@ -61,6 +61,7 @@ public class PlatformOrderMabangServiceImpl extends ServiceImpl> futures = orderIds.stream() .map(id -> CompletableFuture.supplyAsync(() -> { - OrderSuspendRequestBody body = new OrderSuspendRequestBody(id, sysUser.getRealname() + " : " + orderOperation.getReason()); + OrderSuspendRequestBody body = new OrderSuspendRequestBody(id, ABNORMAL_LABEL_NAME,sysUser.getRealname() + " : " + orderOperation.getReason()); OrderSuspendRequest request = new OrderSuspendRequest(body); OrderSuspendResponse response = request.send(); Responses r = new Responses();