From be7073e5fd2c3d9a5b24828de75bdf95a6a0f3ea Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 10 Oct 2024 20:05:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=97=E6=95=B0=E6=8D=AE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/order/OrderSplitAllTaskStateConstant.java |  6 +++---
 .../DistributionSplitOrderTaskController.java          | 10 ++++++++--
 .../impl/DistributionSplitOrderTaskServiceImpl.java    |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitAllTaskStateConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitAllTaskStateConstant.java
index 531180361..b116d106e 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitAllTaskStateConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitAllTaskStateConstant.java
@@ -10,9 +10,9 @@ import lombok.Getter;
 @Getter
 public enum OrderSplitAllTaskStateConstant {
 
-	InProgress("未完成",0),
-	finish("已完成",1),
-	cancel("已撤销",2);
+	InProgress("未完成",1),
+	finish("已完成",2),
+	cancel("已撤销",3);
 
 	private final String name;
 	private final Integer value;
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java
index ba5b5b666..fe6b85b6c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java
@@ -14,6 +14,7 @@ import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @AllArgsConstructor
@@ -23,8 +24,13 @@ public class DistributionSplitOrderTaskController {
 
 
 	@PostMapping("/add-package-code")
-	public R<String> addPackageCode(Long taskId, List<String> packageCodes) {
-		return distributionSplitOrderTaskService.addPackageCode(taskId, packageCodes);
+	public R<String> addPackageCode(@RequestBody Map mao) {
+
+		String taskId = (String) mao.get("taskId");
+		List<String> packageCodes = (List<String>) mao.get("packageCodes");
+
+
+		return distributionSplitOrderTaskService.addPackageCode(Long.parseLong(taskId), packageCodes);
 	}
 
 	@GetMapping("/all-task-list")
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java
index 483640402..abdaa7555 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java
@@ -204,6 +204,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl<Distr
 		if (task == null) {
 			return R.fail("拆单任务不存在");
 		}
+
 		if (!task.getState().equals(OrderSplitAllTaskStateConstant.InProgress.getValue())) {
 			return R.fail("拆单任务已完成，无法添加");
 		}