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 addPackageCode(Long taskId, List packageCodes) { - return distributionSplitOrderTaskService.addPackageCode(taskId, packageCodes); + public R addPackageCode(@RequestBody Map mao) { + + String taskId = (String) mao.get("taskId"); + List packageCodes = (List) 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