Эх сурвалжийг харах

取消运单,取消门卫订单状态校验

donglang 1 сар өмнө
parent
commit
99745e46d8

+ 4 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/CancelHandler.java

@@ -131,6 +131,10 @@ public class CancelHandler extends AbstractWaybillOrderHandler<WaybillOrderCance
         if (gatekeeperWaybillOrder == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.GATEKEEPER_ORDER_NOT_FOUND, "门卫订单不存在!");
         }
+        if (!GatekeeperStatusEnum.PENDING_ENTRY.getCode().equals(gatekeeperWaybillOrder.getStatus())) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.GATEKEEPER_ORDER_STATUS_ERROR, "门卫状态异常,不能取消订单!");
+        }
+
         gatekeeperWaybillOrder.setStatus(GatekeeperStatusEnum.CANCEL.getCode());
         gatekeeperWaybillOrderRepository.updateById(gatekeeperWaybillOrder);
     }

+ 1 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtGatekeeperWaybillOrder.java

@@ -64,7 +64,7 @@ public class KwtGatekeeperWaybillOrder implements Serializable {
     private Integer type;
 
     /**
-     * 状态(1-待进场,5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场
+     * 状态(1-待进场,5-已进场、10-待放行、15-已放行、20-已离场、25-空载离场、99-已取消
      */
     private Integer status;