Skip to content

O
order-group
Commit 0caf1e59 by 刘继明
Options

Merge branch 'feature/jimmy/20240914-新增诺心client' into qa

parents 33959b54 d58fa15e
Showing with 3 additions and 1 deletions
order-management/src/main/java/cn/freemud/management/enums/DeliveryStatus.java
...@@ -19,6 +19,7 @@ import java.util.Objects; ...@@ -19,6 +19,7 @@ import java.util.Objects;
*/ */
public enum DeliveryStatus { public enum DeliveryStatus {
UNCREATE(-2,"未创建运单"),
WATINGORDER(0,"待接单"), WATINGORDER(0,"待接单"),
SYSTEMGETORDER(1,"系统接单"), SYSTEMGETORDER(1,"系统接单"),
ALLOTRIDER(2,"分配骑手"), ALLOTRIDER(2,"分配骑手"),
......
order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java
...@@ -133,7 +133,8 @@ public class DeliveryHandle { ...@@ -133,7 +133,8 @@ public class DeliveryHandle {
//运单异常或取消时，无需作废三方配送运单 //运单异常或取消时，无需作废三方配送运单
if (ObjectUtils.equals(DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus) if (ObjectUtils.equals(DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)
|| ObjectUtils.equals(DeliveryStatus.DELIVERYCANCEL.getCode(), deliverStatus) || ObjectUtils.equals(DeliveryStatus.DELIVERYCANCEL.getCode(), deliverStatus)
|| ObjectUtils.equals(DeliveryStatus.DELIVERYARRIVED.getCode(), deliverStatus)) { || ObjectUtils.equals(DeliveryStatus.DELIVERYARRIVED.getCode(), deliverStatus)
||ObjectUtils.equals(DeliveryStatus.UNCREATE.getCode(), deliverStatus)) {
return ResponseUtil.success(); return ResponseUtil.success();
} }
//运单状态非待接单或系统接单时，不能取消运单 //运单状态非待接单或系统接单时，不能取消运单
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment