From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 17 Jul 2025 18:07:08 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
index b077fbf..9fc34c6 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
@@ -45,7 +45,7 @@
@ApiModelProperty(value = "收货地址")
private String receiverAddress;
- @ApiModelProperty(value = "订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消")
+ @ApiModelProperty(value = "订单状态： 0-已接单 1-已到店 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消")
private String orderStatus;
@ApiModelProperty(value = "接单时间")
@@ -96,7 +96,12 @@
@ApiModelProperty(value = "配送费详情Id")
private String deliveryFeeId;
+ @ApiModelProperty(value = "预计送达时间")
+ private String orderTime;
+
public void copy(RiderOrderRecord source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
+
+ public static final String COL_ORDER_NUM = "order_num";
}
--
Gitblit v1.9.3