运单流程

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -102,7 +102,8 @@ public enum OrderChildEnum {
     // 取消
     public static final List<Integer> CANCEL_lIST = Arrays.asList(
             Status.DRIVER_CANCEL.getCode(),
-            Status.PLATFORM_CANCEL.getCode()
+            Status.PLATFORM_CANCEL.getCode(),
+            Status.OWNER_CANCEL.getCode()
 
     );
 

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -44,7 +44,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_COMPLETE(1304, "运单状态已完成"),
     ORDER_CHILD_LOAD_TIMEOUT(1305, "超过装货截止时间"),
     ORDER_CHILD_CANCEL_FORBID(1306, "运单无法取消"),
-    ORDER_CHILD_CANCEL_FORBID_COUNT(1307, "超出最大取消数量"),
+    ORDER_CHILD_CANCEL_FORBID_COUNT(1307, "今日取消运单次数超过上限，暂时无法取消"),
     ORDER_CHILD_POUND_AUDIT(1308, "磅单审核中"),
     ORDER_CHILD_POUND_REJECT(1309, "磅单审核驳回，请重新提交信息"),
     ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR(1310, "请选择定向车辆"),

performance-web/src/main/java/com/clx/performance/model/OrderGoodsTruckBind.java

@@ -50,7 +50,7 @@ public class OrderGoodsTruckBind implements HasKey<Integer> {
 
     @TableField("modified_time")
     @ApiModelProperty("修改时间")
-    private LocalDateTime updateTime;
+    private LocalDateTime modifiedTime;
 
 
     @Override

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -134,7 +134,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         }
 
         // 禁止取消 (卸车前取消)
-        if (orderChild.getStatus()>OrderChildEnum.Status.UNLOAD.getCode()) {
+        if (orderChild.getStatus()>=OrderChildEnum.Status.UNLOAD.getCode()) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCEL_FORBID);
         }
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -666,7 +666,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         // 禁止取消
-        if (orderChild.getStatus()>OrderChildEnum.Status.ARRIVE_SEND.getCode()) {
+        if (orderChild.getStatus()>=OrderChildEnum.Status.LOAD.getCode()) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCEL_FORBID);
         }