1.根据cash_out表type实际意义调整确认提现逻辑；

2.骑手提现分页数据获取逻辑修改；

src/main/java/com/sqx/modules/pay/dao/CashOutDao.java

@@ -58,6 +58,8 @@ public interface CashOutDao extends BaseMapper<CashOut> {
 
     IPage<CashOutVO> selectCashOutList(@Param("page") IPage<CashOut> pages, @Param("params") CashOutQueryDTO queryDTO);
 
+    IPage<CashOutVO> selectRiderCashOutList(@Param("pages") Page<CashOut> pages, @Param("queryDTO") CashOutQueryDTO queryDTO);
+
     Double selectCashOutTotal(@Param("params") CashOutQueryDTO queryDTO);
 
     Double selectCommissionTotal(@Param("params") CashOutQueryDTO queryDTO);

src/main/java/com/sqx/modules/pay/entity/CashOut.java

@@ -94,7 +94,7 @@ public class CashOut implements Serializable {
     private Double currentBalance;
 
     /**
-     * 1用户提现  2商户提现  3骑手提现
+     * 1骑手提现  2商户提现  3用户提现
      */
     private Integer type;
 

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -121,7 +121,16 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
     @Override
     public PageUtils selectCashOutList(CashOutQueryDTO queryDTO) {
         Page<CashOut> pages = new Page<>(queryDTO.getPage(), queryDTO.getLimit());
-        IPage<CashOutVO> page = this.baseMapper.selectCashOutList(pages, queryDTO);
+
+        // 骑手提现，查询骑手相关信息
+        IPage<CashOutVO> page;
+        if (StrUtil.equals(queryDTO.getType(), "1")) {
+             page = this.baseMapper.selectRiderCashOutList(pages, queryDTO);
+        } else {
+            page = this.baseMapper.selectCashOutList(pages, queryDTO);
+        }
+
+
         return new PageUtils(page);
     }
 
@@ -655,18 +664,18 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             throw new SqxException("无效的用户id");
         }
 
-        // 1用户提现  2商户提现  3骑手提现
+        // 1骑手提现  2商户提现  3用户提现
         Integer cashOutType = cashOut.getType();
 
         String mchId;
-        if (cashOutType == 2) {
+        if (cashOutType == 1) {
+            RiderBankCardInfo riderBankCardInfo = riderBankCardInfoService.getByUserId(userEntity.getUserId());
+            mchId = riderBankCardInfo.getMchId();
+        } else if (cashOutType == 2) {
             // 店铺商户号
             Long adminUserId = userEntity.getAdminUserId();
             GoodsShop goodsShop = goodsShopService.getByAdminUserId(adminUserId);
             mchId = goodsShop.getMchId();
-        } else if (cashOutType == 3) {
-            RiderBankCardInfo riderBankCardInfo = riderBankCardInfoService.getByUserId(userEntity.getUserId());
-            mchId = riderBankCardInfo.getMchId();
         } else {
             throw new SqxException("暂不支持用户类型提现");
         }

src/main/resources/mapper/pay/CashDao.xml

@@ -307,6 +307,16 @@
         order by id desc
     </select>
 
+    <select id="selectRiderCashOutList" resultType="com.sqx.modules.pay.vo.CashOutVO">
+        select co.*, rs.station_name as stationName, tu.user_name as userName, rbci.mch_id as mchId
+        from cash_out co
+        left join tb_user tu on tu.user_id = co.user_id
+        left join rider_bank_card_info rbci on rbci.user_id = co.user_id
+        left join rider_station rs on tu.rider_station_id=rs.id
+        <include refid="cashOutQueryCondition"></include>
+        order by co.id desc
+    </select>
+
     <select id="selectCashOutTotal" resultType="java.lang.Double">
         select ifnull(sum(co.money), 0.0) as totalMoney
         from cash_out co
@@ -331,4 +341,5 @@
         order by id desc
     </select>
 
+
 </mapper>