From 341ed4e217f20caae7f827dcbd8fb93eff937055 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 17:03:00 +0800
Subject: [PATCH] 添加配送费详情ID

---
 oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml         |    3 ++-
 oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java |    3 +++
 2 files changed, 5 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..b077fbf 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
@@ -93,6 +93,9 @@
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
+    @ApiModelProperty(value = "配送费详情Id")
+    private String deliveryFeeId;
+
     public void copy(RiderOrderRecord source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
index 5549df0..b7d5b39 100644
--- a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
+++ b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
@@ -29,13 +29,14 @@
         <result column="merchant_longitude" property="merchantLongitude"/>
         <result column="merchant_latitude" property="merchantLatitude"/>
         <result column="user_id" property="userId"/>
+        <result column="delivery_fee_id" property="deliveryFeeId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         record_id, order_id, order_num, merchant_id, merchant_name, merchant_address,
         receiver_address, order_status, accept_time, accept_num, finish_time, delivery_duration,
         is_overtime, order_source, order_income, create_by, create_time, update_by, update_time,
-        rider_id, phone, rider_name, user_id, user_longitude, user_latitude, merchant_longitude, merchant_latitude
+        rider_id, phone, rider_name, user_id, user_longitude, user_latitude, merchant_longitude, merchant_latitude,delivery_fee_id
     </sql>
     <select id="findAll" resultMap="BaseResultMap">
         select

--
Gitblit v1.9.3