From a56a9afaa634a26c9f02acca1bf35eff7b2f2e33 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 22 Jul 2025 19:45:04 +0800
Subject: [PATCH] 骑手订单新增用户手机号字段
---
oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java | 3 +++
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 1 +
oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml | 7 ++++++-
oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java | 4 ++++
4 files changed, 14 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 9fc34c6..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
@@ -99,6 +99,10 @@
@ApiModelProperty(value = "预计送达时间")
private String orderTime;
+ @ApiModelProperty(value = "用户手机号")
+ private String userName;
+
+
public void copy(RiderOrderRecord source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java
index 4ef50fc..ffdcbce 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java
@@ -45,6 +45,9 @@
@ApiModelProperty(value = "订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消")
private String orderStatus;
+ @ApiModelProperty(value = "用户手机号")
+ private String userName;
+
@ApiModelProperty(value = "是否超时：1-是 0-否")
private String isOvertime;
private List<Timestamp> acceptTime;
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
index 78ac98d..f0080c6 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -253,6 +253,7 @@
// riderOrderRecord.setDeliveryFeeId(orderResponse.getOrder().getDeliveryFeeId());
riderOrderRecord.setOrderIncome(orderResponse.getOrder().getSendPrice());
riderOrderRecord.setOrderTime(orderResponse.getOrder().getOrderTime());
+ riderOrderRecord.setUserName(orderResponse.getOrder().getUsername());
create(riderOrderRecord);
}
diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
index 354abbc..220b066 100644
--- a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
+++ b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
@@ -31,6 +31,7 @@
<result column="user_id" property="userId"/>
<result column="delivery_fee_id" property="deliveryFeeId"/>
<result column="order_time" property="orderTime"/>
+ <result column="user_name" property="userName"/>
</resultMap>
<sql id="Base_Column_List">
@@ -62,7 +63,8 @@
merchant_longitude,
merchant_latitude,
delivery_fee_id,
- order_time
+ order_time,
+ user_name
</sql>
<select id="findAll" resultMap="BaseResultMap">
select
@@ -75,6 +77,9 @@
<if test="criteria.userId != null">
and user_id = #{criteria.userId}
</if>
+ <if test="criteria.userName != null">
+ and user_name = #{criteria.userName}
+ </if>
<if test="criteria.orderId != null">
and order_id = #{criteria.orderId}
</if>
--
Gitblit v1.9.3