From 299d580d2fd27200c62ff14b8b34938569292e8e Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 02 Jul 2025 17:13:23 +0800
Subject: [PATCH] 骑手钱包添加字段

---
 oying-system/src/main/java/com/oying/modules/rider/domain/RiderWalletInfo.java                  |    8 ++++++++
 oying-system/src/main/resources/mapper/rider/RiderWalletInfoMapper.xml                          |   20 ++++++++++++++++++--
 oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderWalletInfoQueryCriteria.java |   11 +++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderWalletInfo.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderWalletInfo.java
index 29af9e4..beba825 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderWalletInfo.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderWalletInfo.java
@@ -60,6 +60,14 @@
     @ApiModelProperty(value = "钱包状态(0冻结,1正常)")
     private String status;
 
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "骑手姓名")
+    private String cardName;
+
+    @ApiModelProperty(value = "骑手身份证号")
+    private String cardNum;
 
     public void copy(RiderWalletInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderWalletInfoQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderWalletInfoQueryCriteria.java
index 477fdb3..e92f556 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderWalletInfoQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderWalletInfoQueryCriteria.java
@@ -24,6 +24,17 @@
 
     @ApiModelProperty(value = "钱包状态(0冻结,1正常)")
     private String status;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "骑手姓名")
+    private String cardName;
+
+    @ApiModelProperty(value = "骑手身份证号")
+    private String cardNum;
+
     private List<BigDecimal> amount;
+
     private List<Timestamp> createTime;
 }
diff --git a/oying-system/src/main/resources/mapper/rider/RiderWalletInfoMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderWalletInfoMapper.xml
index 04cdd53..7eb1599 100644
--- a/oying-system/src/main/resources/mapper/rider/RiderWalletInfoMapper.xml
+++ b/oying-system/src/main/resources/mapper/rider/RiderWalletInfoMapper.xml
@@ -18,10 +18,17 @@
         <result column="create_time" property="createTime"/>
         <result column="update_by" property="updateBy"/>
         <result column="update_time" property="updateTime"/>
+        <result column="phone" property="phone"/>
+        <result column="card_name" property="cardName"/>
+        <result column="card_num" property="cardNum"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        wallet_id, rider_id, amount, available_balance, purchasing_electricity_amount, withdraw_total, income_total, frozen_amount, run_total, cash_withdrawal_total, purchasing_electricity_total, status, create_by, create_time, update_by, update_time
+        wallet_id, rider_id, amount, available_balance,
+        purchasing_electricity_amount, withdraw_total,
+        income_total, frozen_amount, run_total, cash_withdrawal_total,
+        purchasing_electricity_total, status, create_by, create_time,
+        update_by, update_time, phone, card_name, card_num
     </sql>
 
     <select id="findAll" resultMap="BaseResultMap">
@@ -31,6 +38,15 @@
         <where>
             <if test="criteria.riderId != null">
                 and rider_id = #{criteria.riderId}
+            </if>
+             <if test="criteria.phone != null">
+                and phone = #{criteria.phone}
+            </if>
+             <if test="criteria.cardName != null">
+                and card_name = #{criteria.cardName}
+            </if>
+             <if test="criteria.cardNum != null">
+                and card_num = #{criteria.cardNum}
             </if>
             <if test="criteria.status != null">
                 and status = #{criteria.status}
@@ -42,6 +58,6 @@
                 AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
             </if>
         </where>
-        order by wallet_id desc
+        order by create_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3