From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java | 14 +++++++++++++-
1 files changed, 13 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 310b0a4..d37fe8e 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 = "接单时间")
@@ -93,7 +93,19 @@
@ApiModelProperty(value = "用户id")
private Long userId;
+ @ApiModelProperty(value = "配送费详情Id")
+ private String deliveryFeeId;
+
+ @ApiModelProperty(value = "预计送达时间")
+ private String orderTime;
+
+ @ApiModelProperty(value = "用户手机号")
+ private String userName;
+
+
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