提交 019b8ee9 authored 作者: liruixin's avatar liruixin

运单详情日志修改

上级 2249ea24
...@@ -31,8 +31,8 @@ public enum OrderChildEnum { ...@@ -31,8 +31,8 @@ public enum OrderChildEnum {
COMPLETE(100, "完成"), COMPLETE(100, "完成"),
DRIVER_CANCEL(110, "司机取消"), DRIVER_CANCEL(110, "司机取消"),
PLATFORM_CANCEL(111, "平台取消"), PLATFORM_CANCEL(111, "承运取消"),
OWNER_CANCEL(112, "货主取消运单"), OWNER_CANCEL(112, "货主取消"),
// //
// OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆 // OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆
......
...@@ -12,7 +12,7 @@ public enum OrderChildLogEnum { ...@@ -12,7 +12,7 @@ public enum OrderChildLogEnum {
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum Type { public enum Type {
CREATED(11, "接单成功"), CREATED(11, "已接单"),
PAY(21, "支付成功"), PAY(21, "支付成功"),
...@@ -21,8 +21,8 @@ public enum OrderChildLogEnum { ...@@ -21,8 +21,8 @@ public enum OrderChildLogEnum {
GO_TO_RECEIVE(33, "前往目的地"), GO_TO_RECEIVE(33, "前往目的地"),
ARRIVE_RECEIVE(34 , "到达目的地"), ARRIVE_RECEIVE(34 , "到达目的地"),
LOAD(41, "提交装货信息"), LOAD(41, "装车成功"),
UNLOAD(42, "提交卸货信息"), UNLOAD(42, "收货待确认"),
RELOAD(43, "修改装货信息"), RELOAD(43, "修改装货信息"),
REUNLOAD(44, "修改卸货信息"), REUNLOAD(44, "修改卸货信息"),
RELOAD_AND_REUNLOAD(45, "修改装货、卸货信息"), RELOAD_AND_REUNLOAD(45, "修改装货、卸货信息"),
...@@ -37,8 +37,8 @@ public enum OrderChildLogEnum { ...@@ -37,8 +37,8 @@ public enum OrderChildLogEnum {
COMPLETE(100, "完成"), COMPLETE(100, "完成"),
DRIVER_CANCEL(110, "司机取消"), DRIVER_CANCEL(110, "司机取消"),
PLATFORM_CANCEL(111, "平台取消"), PLATFORM_CANCEL(111, "承运取消"),
OWNER_CANCEL(112, "货主取消运单"), OWNER_CANCEL(112, "货主取消"),
; ;
......
...@@ -23,7 +23,6 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order ...@@ -23,7 +23,6 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order
, OrderChildLogEnum.Type.RELOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getCode() , OrderChildLogEnum.Type.RELOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getCode()
, OrderChildLogEnum.Type.SETTLEMENT.getCode(), OrderChildLogEnum.Type.POUND_AUDIT.getCode() , OrderChildLogEnum.Type.SETTLEMENT.getCode(), OrderChildLogEnum.Type.POUND_AUDIT.getCode()
, OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode() , OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode()
, OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.OWNER_CANCEL.getCode() , OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode()).groupBy(OrderChildLog::getType));
, OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode()).groupBy(OrderChildLog::getType));
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论