筛选条件问题

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -2,6 +2,7 @@ package com.sckw.payment.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageInfo;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
@@ -33,6 +34,9 @@ import com.sckw.payment.model.dto.page.PrePayWalletPage;
 import com.sckw.payment.model.dto.wallet.*;
 import com.sckw.payment.model.vo.PrePayWalletVo;
 import com.sckw.payment.model.vo.req.*;
+import com.sckw.payment.model.vo.req.page.PrePayPage;
+import com.sckw.payment.model.vo.req.page.MoneyPage;
+import com.sckw.payment.model.vo.req.page.RefundPage;
 import com.sckw.payment.model.vo.res.*;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisLockKey;
@@ -1236,9 +1240,6 @@ public class WalletService {
      * @return
      */
     public Object refundList(RefundPage refundPage) {
-        if (StringUtils.isNotBlank(refundPage.getChannel())) {
-            refundPage.setChannel(ChannelEnum.valueToChannel(refundPage.getChannel()));
-        }
         if (StringUtils.isNotBlank(refundPage.getStartCreateTime())) {
             refundPage.setStartCreateTime(StringTimeUtil.fillStart(refundPage.getStartCreateTime()));
         }
@@ -1254,6 +1255,176 @@ public class WalletService {
         return walletRefundVoPageRes;
     }
 
+    /**
+     * 资金明细-充值订单列表
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<ChargeDetailVo> rechargeList(MoneyPage moneyPage) {
+        ChargeDetailVo chargeDetailVo = new ChargeDetailVo();
+        chargeDetailVo.setBalance(new BigDecimal("0"));
+        chargeDetailVo.setOrderNo("");
+        chargeDetailVo.setChannel("");
+        chargeDetailVo.setChannelDict("");
+        chargeDetailVo.setChannelLabel("");
+        chargeDetailVo.setUid("");
+        chargeDetailVo.setUidName("");
+        chargeDetailVo.setFilter("");
+        chargeDetailVo.setFilterName("");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("");
+        chargeDetailVo.setMoney(new BigDecimal("0"));
+        chargeDetailVo.setRemark("");
+        chargeDetailVo.setCreateTime(LocalDateTime.now());
+        List<ChargeDetailVo> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<ChargeDetailVo> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
+    /**
+     * 资金明细-转账订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<WalletDetailBase> transferOrder(MoneyPage moneyPage) {
+        WalletDetailBase chargeDetailVo = new WalletDetailBase();
+        chargeDetailVo.setOrderNo("");
+        chargeDetailVo.setChannel("");
+        chargeDetailVo.setChannelDict("");
+        chargeDetailVo.setChannelLabel("");
+        chargeDetailVo.setUid("");
+        chargeDetailVo.setUidName("");
+        chargeDetailVo.setFilter("");
+        chargeDetailVo.setFilterName("");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("");
+        chargeDetailVo.setMoney(new BigDecimal("0"));
+        chargeDetailVo.setRemark("");
+        chargeDetailVo.setCreateTime(LocalDateTime.now());
+        List<WalletDetailBase> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<WalletDetailBase> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
+    /**
+     * 资金明细-退款订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<WalletDetailBase> refundOrder(MoneyPage moneyPage) {
+        WalletDetailBase chargeDetailVo = new WalletDetailBase();
+        chargeDetailVo.setOrderNo("");
+        chargeDetailVo.setChannel("");
+        chargeDetailVo.setChannelDict("");
+        chargeDetailVo.setChannelLabel("");
+        chargeDetailVo.setUid("");
+        chargeDetailVo.setUidName("");
+        chargeDetailVo.setFilter("");
+        chargeDetailVo.setFilterName("");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("");
+        chargeDetailVo.setMoney(new BigDecimal("0"));
+        chargeDetailVo.setRemark("");
+        chargeDetailVo.setCreateTime(LocalDateTime.now());
+        List<WalletDetailBase> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<WalletDetailBase> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
+    /**
+     * 资金明细-提现订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<ChargeDetailVo> cashOrder(MoneyPage moneyPage) {
+        ChargeDetailVo chargeDetailVo = new ChargeDetailVo();
+        chargeDetailVo.setBalance(new BigDecimal("0"));
+        chargeDetailVo.setOrderNo("");
+        chargeDetailVo.setChannel("");
+        chargeDetailVo.setChannelDict("");
+        chargeDetailVo.setChannelLabel("");
+        chargeDetailVo.setUid("");
+        chargeDetailVo.setUidName("");
+        chargeDetailVo.setFilter("");
+        chargeDetailVo.setFilterName("");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("");
+        chargeDetailVo.setMoney(new BigDecimal("0"));
+        chargeDetailVo.setRemark("");
+        chargeDetailVo.setCreateTime(LocalDateTime.now());
+        List<ChargeDetailVo> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<ChargeDetailVo> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
+    /**
+     * 预付-退款订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<WalletDetailBase> prePayRefund(MoneyPage moneyPage) {
+        WalletDetailBase chargeDetailVo = new WalletDetailBase();
+        chargeDetailVo.setOrderNo("");
+        chargeDetailVo.setChannel("");
+        chargeDetailVo.setChannelDict("");
+        chargeDetailVo.setChannelLabel("");
+        chargeDetailVo.setUid("");
+        chargeDetailVo.setUidName("");
+        chargeDetailVo.setFilter("");
+        chargeDetailVo.setFilterName("");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("");
+        chargeDetailVo.setMoney(new BigDecimal("0"));
+        chargeDetailVo.setRemark("");
+        chargeDetailVo.setCreateTime(LocalDateTime.now());
+        List<WalletDetailBase> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<WalletDetailBase> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
+    /**
+     * 预收-退款订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    public PageRes<WalletDetailBase> preReceiveRefund(MoneyPage moneyPage) {
+        WalletDetailBase chargeDetailVo = new WalletDetailBase();
+        chargeDetailVo.setOrderNo("");
+        chargeDetailVo.setChannel("");
+        chargeDetailVo.setChannelDict("");
+        chargeDetailVo.setChannelLabel("");
+        chargeDetailVo.setUid("");
+        chargeDetailVo.setUidName("");
+        chargeDetailVo.setFilter("");
+        chargeDetailVo.setFilterName("");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("");
+        chargeDetailVo.setMoney(new BigDecimal("0"));
+        chargeDetailVo.setRemark("");
+        chargeDetailVo.setCreateTime(LocalDateTime.now());
+        List<WalletDetailBase> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<WalletDetailBase> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
     /**
      * 退款处理
      *