From 7657bfd6aaaa6df1dea8be3293995f63ee79ed2a Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 29 Oct 2024 15:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rl/RlDividendDetailController.java        |   5 +-
 .../deliveryOrder/RlDeliveryOrderQuery.java   |   3 +
 .../dividendDetail/DividendDetailQuery.java   |   7 -
 .../dividendDetail/RlDividendDetailQuery.java |  11 ++
 .../ruoyi/system/domain/vo/IndexAdminVo.java  |   2 +-
 .../system/mapper/RlDividendDetailMapper.java |   3 +-
 .../service/IRlDividendDetailService.java     |   3 +-
 .../service/impl/RlAgentServiceImpl.java      |   1 -
 .../impl/RlDividendDetailServiceImpl.java     |   3 +-
 .../service/impl/RlOrderServiceImpl.java      | 117 ++++++++++-------
 .../service/impl/RlUserServiceImpl.java       |   2 +-
 .../mapper/system/RlAccessoryMapper.xml       |   7 +-
 .../resources/mapper/system/RlAgentMapper.xml |  19 ++-
 .../mapper/system/RlChangeBalanceMapper.xml   |  27 ++--
 .../mapper/system/RlDeliveryOrderMapper.xml   |  36 +++---
 .../system/RlDeliveryOrderOperMapper.xml      |   2 +-
 .../mapper/system/RlDividendDetailMapper.xml  |  24 ++--
 .../mapper/system/RlOperatingAreaMapper.xml   |  27 ++--
 .../resources/mapper/system/RlOrderMapper.xml | 121 +++++++++---------
 .../mapper/system/RlWithdrawMapper.xml        |  27 ++--
 20 files changed, 235 insertions(+), 212 deletions(-)
 delete mode 100644 ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/DividendDetailQuery.java
 create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/RlDividendDetailQuery.java

diff --git a/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlDividendDetailController.java b/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlDividendDetailController.java
index 782045d..1be6e2c 100644
--- a/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlDividendDetailController.java
+++ b/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlDividendDetailController.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetail;
+import com.ruoyi.system.domain.dividendDetail.RlDividendDetailQuery;
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetailVO;
 import com.ruoyi.system.service.IRlDividendDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@ public class RlDividendDetailController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:detail:list')")
     @GetMapping("/list")
-    public TableDataInfo list(RlDividendDetail rlDividendDetail)
+    public TableDataInfo list(RlDividendDetailQuery rlDividendDetail)
     {
         startPage();
         List<RlDividendDetailVO> list = rlDividendDetailService.selectRlDividendDetailList(rlDividendDetail);
@@ -48,7 +49,7 @@ public class RlDividendDetailController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:detail:export')")
     @Log(title = "分账明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, RlDividendDetail rlDividendDetail)
+    public void export(HttpServletResponse response, RlDividendDetailQuery rlDividendDetail)
     {
         List<RlDividendDetailVO> list = rlDividendDetailService.selectRlDividendDetailList(rlDividendDetail);
         ExcelUtil<RlDividendDetailVO> util = new ExcelUtil<RlDividendDetailVO>(RlDividendDetailVO.class);
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/deliveryOrder/RlDeliveryOrderQuery.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/deliveryOrder/RlDeliveryOrderQuery.java
index dbc7578..6e3ff38 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/domain/deliveryOrder/RlDeliveryOrderQuery.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/deliveryOrder/RlDeliveryOrderQuery.java
@@ -10,4 +10,7 @@ public class RlDeliveryOrderQuery extends RlDeliveryOrder{
 
     /** 关键字: 手机号或订单号 */
     private String keywords;
+
+    /** 代理商名称 */
+    private String agentName;
 }
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/DividendDetailQuery.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/DividendDetailQuery.java
deleted file mode 100644
index 216754e..0000000
--- a/ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/DividendDetailQuery.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.ruoyi.system.domain.dividendDetail;
-
-import lombok.Data;
-
-@Data
-public class DividendDetailQuery extends RlDividendDetail{
-}
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/RlDividendDetailQuery.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/RlDividendDetailQuery.java
new file mode 100644
index 0000000..374ae54
--- /dev/null
+++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/dividendDetail/RlDividendDetailQuery.java
@@ -0,0 +1,11 @@
+package com.ruoyi.system.domain.dividendDetail;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class RlDividendDetailQuery extends RlDividendDetail{
+
+    /** 代理商名称 */
+    private String agentName;
+}
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/vo/IndexAdminVo.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/vo/IndexAdminVo.java
index b214e59..228ebf3 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/domain/vo/IndexAdminVo.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/vo/IndexAdminVo.java
@@ -47,7 +47,7 @@ public class IndexAdminVo {
     private BigDecimal todayIncome;
 
     /** 今日订单数 */
-    private BigDecimal todayOrderNum;
+    private Integer todayOrderNum;
 
     /** 较昨日营收 */
     private BigDecimal comparedYesterdayIncome;
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlDividendDetailMapper.java b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlDividendDetailMapper.java
index ffc7c5a..01c932f 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlDividendDetailMapper.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlDividendDetailMapper.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetail;
+import com.ruoyi.system.domain.dividendDetail.RlDividendDetailQuery;
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetailVO;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public interface RlDividendDetailMapper
      * @param rlDividendDetail 分账明细
      * @return 分账明细集合
      */
-    public List<RlDividendDetailVO> selectRlDividendDetailList(RlDividendDetail rlDividendDetail);
+    public List<RlDividendDetailVO> selectRlDividendDetailList(RlDividendDetailQuery rlDividendDetail);
 
     /**
      * 新增分账明细
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlDividendDetailService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlDividendDetailService.java
index 00c6422..e7b211a 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlDividendDetailService.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlDividendDetailService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service;
 
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetail;
+import com.ruoyi.system.domain.dividendDetail.RlDividendDetailQuery;
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetailVO;
 import com.ruoyi.system.domain.order.RlOrder;
 
@@ -29,7 +30,7 @@ public interface IRlDividendDetailService
      * @param rlDividendDetail 分账明细
      * @return 分账明细集合
      */
-    public List<RlDividendDetailVO> selectRlDividendDetailList(RlDividendDetail rlDividendDetail);
+    public List<RlDividendDetailVO> selectRlDividendDetailList(RlDividendDetailQuery rlDividendDetail);
 
     /**
      * 根据订单号查询分账明细列表
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlAgentServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlAgentServiceImpl.java
index 2be763d..426e34e 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlAgentServiceImpl.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlAgentServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.system.domain.agent.RlAgent;
 import com.ruoyi.system.domain.agent.RlAgentVO;
-import com.ruoyi.system.domain.area.RlOperatingArea;
 import com.ruoyi.system.domain.area.RlOperatingAreaVO;
 import com.ruoyi.system.domain.cancelRule.RlCancelRule;
 import com.ruoyi.system.mapper.RlAgentMapper;
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlDividendDetailServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlDividendDetailServiceImpl.java
index 76b24c8..6e22bf2 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlDividendDetailServiceImpl.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlDividendDetailServiceImpl.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.agent.RlAgentVO;
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetail;
+import com.ruoyi.system.domain.dividendDetail.RlDividendDetailQuery;
 import com.ruoyi.system.domain.dividendDetail.RlDividendDetailVO;
 import com.ruoyi.system.domain.order.RlOrder;
 import com.ruoyi.system.domain.userExt.RlUserExt;
@@ -68,7 +69,7 @@ public class RlDividendDetailServiceImpl implements IRlDividendDetailService
      */
     @Override
     @DataScope(agentAlias = "a",userAlias = "u")
-    public List<RlDividendDetailVO> selectRlDividendDetailList(RlDividendDetail rlDividendDetail)
+    public List<RlDividendDetailVO> selectRlDividendDetailList(RlDividendDetailQuery rlDividendDetail)
     {
         return rlDividendDetailMapper.selectRlDividendDetailList(rlDividendDetail);
     }
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
index e0bf743..59f9f44 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
@@ -203,9 +203,7 @@ public class RlOrderServiceImpl implements IRlOrderService
         List<RlOrderOper> rlOrderOpers = rlOrderOperService.selectRlOrderOperList(orderOper);
         order.setOrderOpers(rlOrderOpers);
         /** 收益明细*/
-        RlDividendDetail rlDividendDetail = new RlDividendDetail();
-        rlDividendDetail.setOrderNo(orderNo);
-        List<RlDividendDetailVO> rlDividendDetails = rlDividendDetailService.selectRlDividendDetailList(rlDividendDetail);
+        List<RlDividendDetailVO> rlDividendDetails = rlDividendDetailService.selectRlDividendDetailListByOrderNo(orderNo);
         order.setRlDividendDetails(rlDividendDetails);
 
         RlDeliveryOrder deliveryOrder = deliveryOrderService.selectRlDeliveryOrderByOrderNo(orderNo);
@@ -741,9 +739,7 @@ public class RlOrderServiceImpl implements IRlOrderService
     }
 
     private void refundDividendHandle(RlOrderVO rlOrderVO, BigDecimal refundPercentage) {
-        RlDividendDetail rlDividendDetail = new RlDividendDetail();
-        rlDividendDetail.setOrderNo(rlOrderVO.getOrderNo());
-        List<RlDividendDetailVO> dividendDetails = rlDividendDetailService.selectRlDividendDetailList(rlDividendDetail);
+        List<RlDividendDetailVO> dividendDetails = rlDividendDetailService.selectRlDividendDetailListByOrderNo(rlOrderVO.getOrderNo());
         for(RlDividendDetail detail:dividendDetails){
             /** 4.1 余额不足判断 */
             RlUserExt rlUserExt = userExtService.selectRlUserExtByUserId(detail.getPartnerId());
@@ -916,50 +912,73 @@ public class RlOrderServiceImpl implements IRlOrderService
     private IndexAdminVo getIndexAdminVoByAgentId(String startTime, String endTime, DateTimeFormatter formatter, Long agentId,Long merchantId) {
         // 校验输入时间格式并判断时间区间是否超过15天
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
-            // 使用LocalDate统一日期处理
-            LocalDate startDate = LocalDate.parse(startTime, formatter);
-            LocalDate endDate = LocalDate.parse(endTime, formatter);
-
-            // 计算两者之间的天数差异
-            long daysBetween = ChronoUnit.DAYS.between(startDate, endDate);
-            if (daysBetween > 15) {
-                throw new ServiceException("时间范围不能超过15天");
-            }
-
-            // 创建结果对象
-            IndexAdminVo indexAdminVo = new IndexAdminVo();
-            ArrayList<IndexAdminVo.IncomeVo> incomeVos = new ArrayList<>();
-
-            // 遍历从 startDate 到 endDate 的每一天，生成订单数据
-            for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
-                IndexAdminVo.IncomeVo orderFee = new IndexAdminVo.IncomeVo();
-                String day = date.format(formatter);
-                String startDateStr = day + " "+ Constants.DATE_FORMAT_START_PEREND;
-                String endDateStr = day + " " +Constants.DATE_FORMAT_END_PEREND;
-                orderFee.setDay(day); // 设置每一天的日期
-                BigDecimal orderFee1 = orderMapper.getOrderFee(startDateStr, endDateStr, agentId,merchantId);//订单金额
-                orderFee.setOrderFee(orderFee1);
-                orderFee.setOrderNum(orderMapper.getOrderNum(startDateStr, endDateStr, agentId,merchantId));//订单数量
-
-                incomeVos.add(orderFee);
-            }
-            // 设置收入数据
-            indexAdminVo.setIncomeVoList(incomeVos);
-            indexAdminVo.setTodayOrderNum(new BigDecimal(10));
-            indexAdminVo.setTodayIncome(new BigDecimal(100));
-            indexAdminVo.setComparedYesterdayIncome(new BigDecimal(5));
-            indexAdminVo.setComparedYesterdayOrderNum(new BigDecimal(5));
-
-            // 设置车辆统计数据
-            IndexAdminVo.DeviceVO deviceVO = new IndexAdminVo.DeviceVO();
-            deviceVO.setTotal(deviceService.getTatalDeviceCount(agentId, merchantId,null,null));
-            deviceVO.setIdle(deviceService.getTatalDeviceCount(agentId, merchantId,ServiceConstants.VEHICLE_STATUS_NORMAL,null));
-            String[] statusList = new String[] { ServiceConstants.VEHICLE_STATUS_IN_USING,ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK };
-            deviceVO.setRent(deviceService.getTatalDeviceCount(agentId, merchantId,null,statusList));
-            indexAdminVo.setDeviceVO(deviceVO);
-            return indexAdminVo;
+            // 获取今日订单数量和收入
+            startTime = DateUtils.getYYYY_MM_DD(DateUtils.getNowDate()) + " " + Constants.DATE_FORMAT_START_PEREND;
+            endTime = DateUtils.getYYYY_MM_DD(DateUtils.getNowDate()) + " " + Constants.DATE_FORMAT_END_PEREND;
         }
-        throw new ServiceException("开始时间和结束时间不能为空");
+        // 使用LocalDate统一日期处理
+        LocalDate startDate = LocalDate.parse(startTime, formatter);
+        LocalDate endDate = LocalDate.parse(endTime, formatter);
+
+        // 计算两者之间的天数差异
+        long daysBetween = ChronoUnit.DAYS.between(startDate, endDate);
+        if (daysBetween > 15) {
+            throw new ServiceException("时间范围不能超过15天");
+        }
+
+        // 创建结果对象
+        IndexAdminVo indexAdminVo = new IndexAdminVo();
+        ArrayList<IndexAdminVo.IncomeVo> incomeVos = new ArrayList<>();
+
+        // 遍历从 startDate 到 endDate 的每一天，生成订单数据
+        for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
+            IndexAdminVo.IncomeVo orderFee = new IndexAdminVo.IncomeVo();
+            String day = date.format(formatter);
+            String startDateStr = day + " "+ Constants.DATE_FORMAT_START_PEREND;
+            String endDateStr = day + " " +Constants.DATE_FORMAT_END_PEREND;
+            orderFee.setDay(day); // 设置每一天的日期
+            BigDecimal orderFee1 = orderMapper.getOrderFee(startDateStr, endDateStr, agentId,merchantId);//订单金额
+            orderFee.setOrderFee(orderFee1);
+            orderFee.setOrderNum(orderMapper.getOrderNum(startDateStr, endDateStr, agentId,merchantId));//订单数量
+
+            incomeVos.add(orderFee);
+        }
+        // 设置收入数据
+        indexAdminVo.setIncomeVoList(incomeVos);
+        // 获取今日订单数量和收入
+        String todayStart = DateUtils.getYYYY_MM_DD(DateUtils.getNowDate()) + " " + Constants.DATE_FORMAT_START_PEREND;
+        String todayEnd = DateUtils.getYYYY_MM_DD(DateUtils.getNowDate()) + " " + Constants.DATE_FORMAT_END_PEREND;
+
+        // 查询今日的订单数和营收
+        Integer todayOrderNum = orderMapper.getOrderNum(todayStart, todayEnd, agentId, merchantId);
+        BigDecimal todayIncome = orderMapper.getOrderFee(todayStart, todayEnd, agentId, merchantId);
+
+        // 设置今日的订单数和营收
+        indexAdminVo.setTodayOrderNum(todayOrderNum);
+        indexAdminVo.setTodayIncome(todayIncome);
+
+        String yesterdayStart = DateUtils.getYYYY_MM_DD(DateUtils.addDays(DateUtils.getNowDate(), -1)) + " " + Constants.DATE_FORMAT_START_PEREND;
+        String yesterdayEnd = DateUtils.getYYYY_MM_DD(DateUtils.addDays(DateUtils.getNowDate(), -1)) + " " + Constants.DATE_FORMAT_END_PEREND;
+        // 查询昨日的订单数和营收
+        Integer yesterdayOrderNum = orderMapper.getOrderNum(yesterdayStart, yesterdayEnd, agentId, merchantId);
+        BigDecimal yesterdayIncome = orderMapper.getOrderFee(yesterdayStart, yesterdayEnd, agentId, merchantId);
+
+        // 计算较昨日的营收和订单数
+        BigDecimal comparedYesterdayIncome = todayIncome.subtract(yesterdayIncome);
+        BigDecimal comparedYesterdayOrderNum = new BigDecimal(todayOrderNum - yesterdayOrderNum);
+
+        // 设置较昨日的营收和订单数
+        indexAdminVo.setComparedYesterdayIncome(comparedYesterdayIncome);
+        indexAdminVo.setComparedYesterdayOrderNum(comparedYesterdayOrderNum);
+
+        // 设置车辆统计数据
+        IndexAdminVo.DeviceVO deviceVO = new IndexAdminVo.DeviceVO();
+        deviceVO.setTotal(deviceService.getTatalDeviceCount(agentId, merchantId,null,null));
+        deviceVO.setIdle(deviceService.getTatalDeviceCount(agentId, merchantId,ServiceConstants.VEHICLE_STATUS_NORMAL,null));
+        String[] statusList = new String[] { ServiceConstants.VEHICLE_STATUS_IN_USING,ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK };
+        deviceVO.setRent(deviceService.getTatalDeviceCount(agentId, merchantId,null,statusList));
+        indexAdminVo.setDeviceVO(deviceVO);
+        return indexAdminVo;
     }
 
     private BigDecimal deposit(Long modelId, PriceVO priceVO) {
diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java
index 2f21523..cbe3e5c 100644
--- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java
+++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java
@@ -716,7 +716,7 @@ public class RlUserServiceImpl implements IRlUserService{
 
     @Override
     public int resetUserPwd(String userName, String password) {
-        return 0;
+        return rlUserMapper.resetUserPwd(userName, password);
     }
 
     @Override
diff --git a/ridelease-system/src/main/resources/mapper/system/RlAccessoryMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlAccessoryMapper.xml
index 1357213..888b39a 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlAccessoryMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlAccessoryMapper.xml
@@ -15,10 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlAccessoryList" parameterType="RlAccessory" resultMap="RlAccessoryResult">
         <include refid="selectRlAccessoryVo"/>
-        <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
+        where 1=1
+        <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+        <if test="status != null "> and status = #{status}</if>
         ${params.dataScope}
         GROUP BY
         a.accessory_id
diff --git a/ridelease-system/src/main/resources/mapper/system/RlAgentMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlAgentMapper.xml
index 5cf93b7..94939a3 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlAgentMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlAgentMapper.xml
@@ -15,16 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlAgentList" parameterType="RlAgent" resultMap="RlAgentResult">
         <include refid="selectRlAgentVo"/>
-        <where>
-            <if test="name != null  and name != ''"> and a.name like concat('%', #{name}, '%')</if>
-            <if test="servicePhone != null  and servicePhone != ''"> and a.service_phone = #{servicePhone}</if>
-            <if test="dispatchFee != null "> and a.dispatch_fee = #{dispatchFee}</if>
-            <if test="deliveryFee != null "> and a.delivery_fee = #{deliveryFee}</if>
-            <if test="cityId != null "> and a.city_id = #{cityId}</if>
-            <if test="contact != null  and contact != ''"> and a.contact = #{contact}</if>
-            <if test="phone != null  and phone != ''"> and a.phone = #{phone}</if>
-            <if test="userid != null "> and a.userid = #{userid}</if>
-        </where>
+        where 1=1
+        <if test="name != null  and name != ''"> and a.name like concat('%', #{name}, '%')</if>
+        <if test="servicePhone != null  and servicePhone != ''"> and a.service_phone = #{servicePhone}</if>
+        <if test="dispatchFee != null "> and a.dispatch_fee = #{dispatchFee}</if>
+        <if test="deliveryFee != null "> and a.delivery_fee = #{deliveryFee}</if>
+        <if test="cityId != null "> and a.city_id = #{cityId}</if>
+        <if test="contact != null  and contact != ''"> and a.contact = #{contact}</if>
+        <if test="phone != null  and phone != ''"> and a.phone = #{phone}</if>
+        <if test="userid != null "> and a.userid = #{userid}</if>
         ${params.dataScope}
         order by a.agent_id desc
     </select>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlChangeBalanceMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlChangeBalanceMapper.xml
index 8cfa1ce..d04e39d 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlChangeBalanceMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlChangeBalanceMapper.xml
@@ -14,20 +14,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlChangeBalanceList" parameterType="RlChangeBalance" resultMap="RlChangeBalanceResult">
         <include refid="selectRlChangeBalanceVo"/>
-        <where>
-            <if test="orderNo != null  and orderNo != ''"> and cb.order_no = #{orderNo}</if>
-            <if test="outTradeNo != null  and outTradeNo != ''"> and cb.out_trade_no = #{outTradeNo}</if>
-            <if test="type != null  and type != ''"> and cb.type = #{type}</if>
-            <if test="busType != null  and busType != ''"> and cb.bus_type = #{busType}</if>
-            <if test="beforeBalance != null "> and cb.before_balance = #{beforeBalance}</if>
-            <if test="afterBalance != null "> and cb.after_balance = #{afterBalance}</if>
-            <if test="amount != null "> and cb.amount = #{amount}</if>
-            <if test="ownerName != null  and ownerName != ''"> and cb.owner_name like concat('%', #{ownerName}, '%')</if>
-            <if test="ownerId != null "> and cb.owner_id = #{ownerId}</if>
-            <if test="ownerPhone != null  and ownerPhone != ''"> and cb.owner_phone = #{ownerPhone}</if>
-            <if test="ownerType != null  and ownerType != ''"> and cb.owner_type = #{ownerType}</if>
-            <if test="reason != null  and reason != ''"> and cb.reason = #{reason}</if>
-        </where>
+        where 1=1
+        <if test="orderNo != null  and orderNo != ''"> and cb.order_no like concat('%', #{orderNo}, '%')</if>
+        <if test="outTradeNo != null  and outTradeNo != ''"> and cb.out_trade_no = #{outTradeNo}</if>
+        <if test="type != null  and type != ''"> and cb.type = #{type}</if>
+        <if test="busType != null  and busType != ''"> and cb.bus_type = #{busType}</if>
+        <if test="beforeBalance != null "> and cb.before_balance = #{beforeBalance}</if>
+        <if test="afterBalance != null "> and cb.after_balance = #{afterBalance}</if>
+        <if test="amount != null "> and cb.amount = #{amount}</if>
+        <if test="ownerName != null  and ownerName != ''"> and cb.owner_name like concat('%', #{ownerName}, '%')</if>
+        <if test="ownerId != null "> and cb.owner_id = #{ownerId}</if>
+        <if test="ownerPhone != null  and ownerPhone != ''"> and cb.owner_phone like concat('%', #{ownerPhone}, '%')</if>
+        <if test="ownerType != null  and ownerType != ''"> and cb.owner_type = #{ownerType}</if>
+        <if test="reason != null  and reason != ''"> and cb.reason = #{reason}</if>
         ${params.dataScope}
         order by create_time desc
     </select>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderMapper.xml
index 81c0d8b..87bd43b 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderMapper.xml
@@ -19,24 +19,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlDeliveryOrderList" parameterType="RlDeliveryOrderVO" resultMap="RlDeliveryOrderResult">
         <include refid="selectRlDeliveryOrderVo"/>
-        <where>
-            <if test="orderNo != null  and orderNo != ''"> and do.order_no = #{orderNo}</if>
-            <if test="agentId != null "> and do.agent_id = #{agentId}</if>
-            <if test="deliverymanId != null  and deliverymanId != ''"> and do.deliveryman_id = #{deliverymanId}</if>
-            <if test="deliverymanType != null  and deliverymanType != ''"> and do.deliveryman_type = #{deliverymanType}</if>
-            <if test="deliveryman != null  and deliveryman != ''"> and do.deliveryman = #{deliveryman}</if>
-            <if test="deliverymanPhone != null  and deliverymanPhone != ''"> and do.deliveryman_phone = #{deliverymanPhone}</if>
-            <if test="status != null  and status != ''"> and do.status = #{status}</if>
-            <if test="statusList != null and  statusList !=''">
-                AND do.status IN
-                <foreach item="item" index="index" collection="statusList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="keywords != null and keywords != ''">
-                AND (o.phone LIKE CONCAT('%', #{keywords}, '%') OR o.order_no LIKE CONCAT('%', #{keywords}, '%'))
-            </if>
-        </where>
+        where 1=1
+        <if test="orderNo != null  and orderNo != ''"> and do.order_no like concat('%', #{orderNo}, '%')</if>
+        <if test="agentId != null "> and do.agent_id = #{agentId}</if>
+        <if test="agentName != null "> and a.name like concat('%', #{agentName}, '%')</if>
+        <if test="deliverymanId != null  and deliverymanId != ''"> and do.deliveryman_id = #{deliverymanId}</if>
+        <if test="deliverymanType != null  and deliverymanType != ''"> and do.deliveryman_type = #{deliverymanType}</if>
+        <if test="deliveryman != null  and deliveryman != ''"> and do.deliveryman like concat('%', #{deliveryman}, '%')</if>
+        <if test="deliverymanPhone != null  and deliverymanPhone != ''"> and do.deliveryman_phone like concat('%', #{deliverymanPhone}, '%')</if>
+        <if test="status != null  and status != ''"> and do.status = #{status}</if>
+        <if test="statusList != null and  statusList !=''">
+            AND do.status IN
+            <foreach item="item" index="index" collection="statusList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="keywords != null and keywords != ''">
+            AND (o.phone LIKE CONCAT('%', #{keywords}, '%') OR o.order_no LIKE CONCAT('%', #{keywords}, '%'))
+        </if>
         ${params.dataScope}
         order by do.delivery_id desc
     </select>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderOperMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderOperMapper.xml
index 308b6c8..c947a0d 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderOperMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlDeliveryOrderOperMapper.xml
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryId != null "> and delivery_id = #{deliveryId}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="operUserid != null "> and oper_userid = #{operUserid}</if>
-            <if test="operPhone != null  and operPhone != ''"> and oper_phone = #{operPhone}</if>
+            <if test="operPhone != null  and operPhone != ''"> and oper_phone like concat('%', #{operPhone}, '%')</if>
             <if test="operName != null  and operName != ''"> and oper_name like concat('%', #{operName}, '%')</if>
             <if test="operTime != null "> and oper_time = #{operTime}</if>
         </where>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlDividendDetailMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlDividendDetailMapper.xml
index 609dde7..7bfa2f8 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlDividendDetailMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlDividendDetailMapper.xml
@@ -13,19 +13,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join rl_user u on u.user_id = dd.partner_id
     </sql>
 
-    <select id="selectRlDividendDetailList" parameterType="RlDividendDetail" resultMap="RlDividendDetailResult">
+    <select id="selectRlDividendDetailList" parameterType="RlDividendDetailQuery" resultMap="RlDividendDetailResult">
         <include refid="selectRlDividendDetailVo"/>
-        <where>
-            <if test="agentId != null "> and dd.agent_id = #{agentId}</if>
-            <if test="partnerId != null "> and dd.partner_id = #{partnerId}</if>
-            <if test="partnerName != null "> and dd.partner_name = #{partnerName}</if>
-            <if test="partnerPhone != null "> and dd.partner_phone = #{partnerPhone}</if>
-            <if test="partnerType != null "> and dd.partner_type = #{partnerType}</if>
-            <if test="orderNo != null  and orderNo != ''"> and dd.order_no = #{orderNo}</if>
-            <if test="totalAmount != null "> and dd.total_amount = #{totalAmount}</if>
-            <if test="dividendAmount != null "> and dd.dividend_amount = #{dividendAmount}</if>
-            <if test="dividendProportion != null "> and dd.dividend_proportion = #{dividendProportion}</if>
-        </where>
+        where 1=1
+        <if test="agentId != null "> and dd.agent_id = #{agentId}</if>
+        <if test="agentName != null "> and a.name like concat('%', #{agentName}, '%')</if>
+        <if test="partnerId != null "> and dd.partner_id = #{partnerId}</if>
+        <if test="partnerName != null "> and dd.partner_name like concat('%', #{partnerName}, '%')</if>
+        <if test="partnerPhone != null "> and dd.partner_phone like concat('%', #{partnerPhone}, '%')</if>
+        <if test="partnerType != null "> and dd.partner_type = #{partnerType}</if>
+        <if test="orderNo != null  and orderNo != ''"> and dd.order_no like concat('%', #{orderNo}, '%')</if>
+        <if test="totalAmount != null "> and dd.total_amount = #{totalAmount}</if>
+        <if test="dividendAmount != null "> and dd.dividend_amount = #{dividendAmount}</if>
+        <if test="dividendProportion != null "> and dd.dividend_proportion = #{dividendProportion}</if>
         ${params.dataScope}
         order by dd.create_time desc
     </select>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlOperatingAreaMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlOperatingAreaMapper.xml
index 5f260c9..30184ac 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlOperatingAreaMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlOperatingAreaMapper.xml
@@ -14,20 +14,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlOperatingAreaList" parameterType="RlOperatingArea" resultMap="RlOperatingAreaResult">
         <include refid="selectRlOperatingAreaVo"/>
-        <where>
-            <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
-            <if test="boundary != null  and boundary != ''"> and boundary = #{boundary}</if>
-            <if test="boundaryStr != null  and boundaryStr != ''"> and boundary_str = #{boundaryStr}</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="areaTime != null  and areaTime != ''"> and area_time = #{areaTime}</if>
-            <if test="areaOutOutage != null  and areaOutOutage != ''"> and area_out_outage = #{areaOutOutage}</if>
-            <if test="areaOutDispatch != null  and areaOutDispatch != ''"> and area_out_dispatch = #{areaOutDispatch}</if>
-            <if test="agreement != null  and agreement != ''"> and agreement = #{agreement}</if>
-            <if test="areaTimeStart != null  and areaTimeStart != ''"> and area_time_start = #{areaTimeStart}</if>
-            <if test="areaTimeEnd != null  and areaTimeEnd != ''"> and area_time_end = #{areaTimeEnd}</if>
-        </where>
+        where 1=1
+        <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
+        <if test="boundary != null  and boundary != ''"> and boundary = #{boundary}</if>
+        <if test="boundaryStr != null  and boundaryStr != ''"> and boundary_str = #{boundaryStr}</if>
+        <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+        <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+        <if test="status != null  and status != ''"> and status = #{status}</if>
+        <if test="areaTime != null  and areaTime != ''"> and area_time = #{areaTime}</if>
+        <if test="areaOutOutage != null  and areaOutOutage != ''"> and area_out_outage = #{areaOutOutage}</if>
+        <if test="areaOutDispatch != null  and areaOutDispatch != ''"> and area_out_dispatch = #{areaOutDispatch}</if>
+        <if test="agreement != null  and agreement != ''"> and agreement = #{agreement}</if>
+        <if test="areaTimeStart != null  and areaTimeStart != ''"> and area_time_start = #{areaTimeStart}</if>
+        <if test="areaTimeEnd != null  and areaTimeEnd != ''"> and area_time_end = #{areaTimeEnd}</if>
         ${params.dataScope}
         order by oa.create_time desc
     </select>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlOrderMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlOrderMapper.xml
index 45490e1..f7992e9 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlOrderMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlOrderMapper.xml
@@ -119,67 +119,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlOrderList" parameterType="RlOrderQuery" resultMap="RlOrderResult">
         <include refid="selectRlOrderDetail"/>
-        <where>
-            <if test="orderNo != null and orderNo != ''"> and o.order_no like concat('%', #{orderNo}, '%')</if>
-            <if test="outTradeNo != null and outTradeNo != ''"> and o.out_trade_no like concat('%', #{outTradeNo}, '%')</if>
-            <if test="userId != null"> and o.user_id = #{userId}</if>
-            <if test="userName != null and userName != ''"> and u.user_name like concat('%', #{userName}, '%')</if>
-            <if test="realName != null and realName != ''"> and o.real_name like concat('%', #{realName}, '%')</if>
-            <if test="phone != null and phone != ''"> and u.phonenumber like concat('%', #{phone}, '%')</if>
-            <if test="ruleId != null"> and o.rule_id = #{ruleId}</if>
-            <if test="deviceMac != null and deviceMac != ''"> and o.device_mac = #{deviceMac}</if>
-            <if test="sn != null and sn != ''"> and o.sn = #{sn}</if>
-            <if test="payTime != null"> and o.pay_time = #{payTime}</if>
-            <if test="payType != null and payType != ''"> and o.pay_type = #{payType}</if>
-            <if test="paid != null and paid != ''"> and o.paid = #{paid}</if>
-            <if test="type != null and type != ''"> and o.type = #{type}</if>
-            <if test="totalFee != null"> and o.total_fee = #{totalFee}</if>
-            <if test="payFee != null"> and o.pay_fee = #{payFee}</if>
-            <if test="deposit != null"> and o.deposit = #{deposit}</if>
-            <if test="dispatchFee != null"> and o.dispatch_fee = #{dispatchFee}</if>
-            <if test="deliveryFee != null"> and o.delivery_fee = #{deliveryFee}</if>
-            <if test="leaseFee != null"> and o.lease_fee = #{leaseFee}</if>
-            <if test="mark != null and mark != ''"> and o.mark = #{mark}</if>
-            <if test="duration != null"> and o.duration = #{duration}</if>
-            <if test="status != null and status != ''"> and o.status = #{status}</if>
-            <if test="returnTime != null"> and o.return_time = #{returnTime}</if>
-            <if test="depositDeduction != null and depositDeduction != ''"> and o.deposit_deduction = #{depositDeduction}</if>
-            <if test="deductionAmount != null"> and o.deduction_amount = #{deductionAmount}</if>
-            <if test="autoRefundDeposit != null"> and o.auto_refund_deposit = #{autoRefundDeposit}</if>
-            <if test="rentalUnit != null and rentalUnit != ''"> and o.rental_unit = #{rentalUnit}</if>
-            <if test="handlingCharge != null"> and o.handling_charge = #{handlingCharge}</if>
-            <if test="platformServiceFee != null"> and o.platform_service_fee = #{platformServiceFee}</if>
-            <if test="operatorDividend != null"> and o.operator_dividend = #{operatorDividend}</if>
-            <if test="payChannel != null"> and o.pay_channel = #{payChannel}</if>
-            <if test="deliveryMethod != null"> and o.delivery_method = #{deliveryMethod}</if>
-            <if test="pickupTime != null"> and o.pickup_time = #{pickupTime}</if>
-            <if test="agentId != null"> and o.agent_id = #{agentId}</if>
-            <if test="storeId != null"> and o.store_id = #{storeId}</if>
-            <if test="storeName != null and storeName != ''"> and o.store_name = #{storeName}</if>
-            <if test="merchantId != null"> and o.merchant_id = #{merchantId}</if>
-            <if test="pickupCity != null and pickupCity != ''"> and o.pickup_city = #{pickupCity}</if>
-            <if test="pickupLoc != null and pickupLoc != ''"> and o.pickup_loc = #{pickupLoc}</if>
-            <if test="pickupLon != null and pickupLon != ''"> and o.pickup_lon = #{pickupLon}</if>
-            <if test="pickupLat != null and pickupLat != ''"> and o.pickup_lat = #{pickupLat}</if>
-            <if test="expiryTime != null"> and o.expiry_time = #{expiryTime}</if>
-            <if test="originalOrderNo != null and originalOrderNo != ''"> and o.original_order_no = #{originalOrderNo}</if>
-            <if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
-                and date_format(o.create_time,'%Y%m%d') &gt;= date_format(#{startTime},'%Y%m%d')
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and date_format(o.create_time,'%Y%m%d') &lt;= date_format(#{endTime},'%Y%m%d')
-            </if>
-            <if test="keywords != null and keywords != ''">
-                AND (u.phonenumber LIKE CONCAT('%', #{keywords}, '%') OR o.order_no LIKE CONCAT('%', #{keywords}, '%'))
-            </if>
-            <if test="phone != null and phone != ''"> and u.phonenumber like concat('%', #{phone}, '%')</if>
-            <if test="statusList != null and  statusList !=''">
-                AND o.status IN
-                <foreach item="item" index="index" collection="statusList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
+        where 1=1
+        <if test="orderNo != null and orderNo != ''"> and o.order_no like concat('%', #{orderNo}, '%')</if>
+        <if test="outTradeNo != null and outTradeNo != ''"> and o.out_trade_no like concat('%', #{outTradeNo}, '%')</if>
+        <if test="userId != null"> and o.user_id = #{userId}</if>
+        <if test="userName != null and userName != ''"> and u.user_name like concat('%', #{userName}, '%')</if>
+        <if test="realName != null and realName != ''"> and o.real_name like concat('%', #{realName}, '%')</if>
+        <if test="phone != null and phone != ''"> and u.phonenumber like concat('%', #{phone}, '%')</if>
+        <if test="ruleId != null"> and o.rule_id = #{ruleId}</if>
+        <if test="deviceMac != null and deviceMac != ''"> and o.device_mac = #{deviceMac}</if>
+        <if test="sn != null and sn != ''"> and o.sn = #{sn}</if>
+        <if test="payTime != null"> and o.pay_time = #{payTime}</if>
+        <if test="payType != null and payType != ''"> and o.pay_type = #{payType}</if>
+        <if test="paid != null and paid != ''"> and o.paid = #{paid}</if>
+        <if test="type != null and type != ''"> and o.type = #{type}</if>
+        <if test="totalFee != null"> and o.total_fee = #{totalFee}</if>
+        <if test="payFee != null"> and o.pay_fee = #{payFee}</if>
+        <if test="deposit != null"> and o.deposit = #{deposit}</if>
+        <if test="dispatchFee != null"> and o.dispatch_fee = #{dispatchFee}</if>
+        <if test="deliveryFee != null"> and o.delivery_fee = #{deliveryFee}</if>
+        <if test="leaseFee != null"> and o.lease_fee = #{leaseFee}</if>
+        <if test="mark != null and mark != ''"> and o.mark = #{mark}</if>
+        <if test="duration != null"> and o.duration = #{duration}</if>
+        <if test="status != null and status != ''"> and o.status = #{status}</if>
+        <if test="returnTime != null"> and o.return_time = #{returnTime}</if>
+        <if test="depositDeduction != null and depositDeduction != ''"> and o.deposit_deduction = #{depositDeduction}</if>
+        <if test="deductionAmount != null"> and o.deduction_amount = #{deductionAmount}</if>
+        <if test="autoRefundDeposit != null"> and o.auto_refund_deposit = #{autoRefundDeposit}</if>
+        <if test="rentalUnit != null and rentalUnit != ''"> and o.rental_unit = #{rentalUnit}</if>
+        <if test="handlingCharge != null"> and o.handling_charge = #{handlingCharge}</if>
+        <if test="platformServiceFee != null"> and o.platform_service_fee = #{platformServiceFee}</if>
+        <if test="operatorDividend != null"> and o.operator_dividend = #{operatorDividend}</if>
+        <if test="payChannel != null"> and o.pay_channel = #{payChannel}</if>
+        <if test="deliveryMethod != null"> and o.delivery_method = #{deliveryMethod}</if>
+        <if test="pickupTime != null"> and o.pickup_time = #{pickupTime}</if>
+        <if test="agentId != null"> and o.agent_id = #{agentId}</if>
+        <if test="storeId != null"> and o.store_id = #{storeId}</if>
+        <if test="storeName != null and storeName != ''"> and o.store_name = #{storeName}</if>
+        <if test="merchantId != null"> and o.merchant_id = #{merchantId}</if>
+        <if test="pickupCity != null and pickupCity != ''"> and o.pickup_city = #{pickupCity}</if>
+        <if test="pickupLoc != null and pickupLoc != ''"> and o.pickup_loc = #{pickupLoc}</if>
+        <if test="pickupLon != null and pickupLon != ''"> and o.pickup_lon = #{pickupLon}</if>
+        <if test="pickupLat != null and pickupLat != ''"> and o.pickup_lat = #{pickupLat}</if>
+        <if test="expiryTime != null"> and o.expiry_time = #{expiryTime}</if>
+        <if test="originalOrderNo != null and originalOrderNo != ''"> and o.original_order_no = #{originalOrderNo}</if>
+        <if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
+            and date_format(o.create_time,'%Y%m%d') &gt;= date_format(#{startTime},'%Y%m%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and date_format(o.create_time,'%Y%m%d') &lt;= date_format(#{endTime},'%Y%m%d')
+        </if>
+        <if test="keywords != null and keywords != ''">
+            AND (u.phonenumber LIKE CONCAT('%', #{keywords}, '%') OR o.order_no LIKE CONCAT('%', #{keywords}, '%'))
+        </if>
+        <if test="phone != null and phone != ''"> and u.phonenumber like concat('%', #{phone}, '%')</if>
+        <if test="statusList != null and  statusList !=''">
+            AND o.status IN
+            <foreach item="item" index="index" collection="statusList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         ${params.dataScope}
         order by o.create_time desc
     </select>
diff --git a/ridelease-system/src/main/resources/mapper/system/RlWithdrawMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlWithdrawMapper.xml
index 1024353..c1d301b 100644
--- a/ridelease-system/src/main/resources/mapper/system/RlWithdrawMapper.xml
+++ b/ridelease-system/src/main/resources/mapper/system/RlWithdrawMapper.xml
@@ -14,20 +14,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRlWithdrawList" parameterType="RlWithdraw" resultMap="RlWithdrawResult">
         <include refid="selectRlWithdrawVo"/>
-        <where>
-            <if test="withdrawNo != null  and withdrawNo != ''"> and w.withdraw_no = #{withdrawNo}</if>
-            <if test="amount != null "> and w.amount = #{amount}</if>
-            <if test="status != null  and status != ''"> and w.status = #{status}</if>
-            <if test="rejectReason != null  and rejectReason != ''"> and w.reject_reason = #{rejectReason}</if>
-            <if test="ownerName != null  and ownerName != ''"> and w.owner_name like concat('%', #{ownerName}, '%')</if>
-            <if test="ownerId != null "> and w.owner_id = #{ownerId}</if>
-            <if test="ownerPhone != null  and ownerPhone != ''"> and w.owner_phone = #{ownerPhone}</if>
-            <if test="handlingCharge != null "> and w.handling_charge = #{handlingCharge}</if>
-            <if test="cost != null "> and w.cost = #{cost}</if>
-            <if test="withdrawChannelId != null "> and w.withdraw_channel_id = #{withdrawChannelId}</if>
-            <if test="handlingChargeType != null "> and w.handling_charge_type = #{handlingChargeType}</if>
-            <if test="withdrawHandlingCharge != null "> and w.withdraw_handling_charge = #{withdrawHandlingCharge}</if>
-        </where>
+        where 1=1
+        <if test="withdrawNo != null  and withdrawNo != ''"> and w.withdraw_no like concat('%', #{withdrawNo}, '%')</if>
+        <if test="amount != null "> and w.amount = #{amount}</if>
+        <if test="status != null  and status != ''"> and w.status = #{status}</if>
+        <if test="rejectReason != null  and rejectReason != ''"> and w.reject_reason like concat('%', #{rejectReason}, '%')</if>
+        <if test="ownerName != null  and ownerName != ''"> and w.owner_name like concat('%', #{ownerName}, '%')</if>
+        <if test="ownerId != null "> and w.owner_id = #{ownerId}</if>
+        <if test="ownerPhone != null  and ownerPhone != ''"> and w.owner_phone like concat('%', #{ownerPhone}, '%')</if>
+        <if test="handlingCharge != null "> and w.handling_charge = #{handlingCharge}</if>
+        <if test="cost != null "> and w.cost = #{cost}</if>
+        <if test="withdrawChannelId != null "> and w.withdraw_channel_id = #{withdrawChannelId}</if>
+        <if test="handlingChargeType != null "> and w.handling_charge_type = #{handlingChargeType}</if>
+        <if test="withdrawHandlingCharge != null "> and w.withdraw_handling_charge = #{withdrawHandlingCharge}</if>
         ${params.dataScope}
         order by create_time
     </select>