钱包功能扩展

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletController.java

@@ -370,7 +370,7 @@ public class WalletController {
      */
     @PostMapping("prePayOrder")
     public HttpResult prePayOrder(@RequestBody @Valid MoneyPage moneyPage) {
-        return HttpResult.ok(walletService.cashOrder(moneyPage));
+        return HttpResult.ok(walletService.prePayOrder(moneyPage));
     }
 
     /**
@@ -393,7 +393,7 @@ public class WalletController {
      */
     @PostMapping("preReceiveOrder")
     public HttpResult preReceiveOrder(@RequestBody @Valid MoneyPage moneyPage) {
-        return HttpResult.ok(walletService.cashOrder(moneyPage));
+        return HttpResult.ok(walletService.preReceiveOrder(moneyPage));
     }
 
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletTransferMapper.java

@@ -2,7 +2,11 @@ package com.sckw.payment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.model.KwpWalletTransfer;
+import com.sckw.payment.model.vo.req.page.MoneyPage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @date 2023-09-06 16:42:08
@@ -10,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface KwpWalletTransferMapper extends BaseMapper<KwpWalletTransfer> {
+    List<KwpWalletTransfer> pageList(@Param("moneyPage") MoneyPage moneyPage);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/CashDetail.java

@@ -1,11 +1,34 @@
 package com.sckw.payment.model.dto.wallet;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
 public class CashDetail {
-    private List<CashDetailItem> timeline;
-    private List<List<CashDetailItem>> content;
+
+    @JSONField(name = "uid")
+    private String uid;
+
+    private String channel;
+
+    @JSONField(name = "channel_label")
+    private String channelLabel;
+
+    @JSONField(name = "order_no")
+    private String orderNo;
+
+    private BigDecimal money;
+    @JSONField(name = "status")
+    private Integer status;
+    @JSONField(name = "status_label")
+    private String statusLabel;
+    @JSONField(name = "create_time")
+    private String createTime;
+    @JSONField(name = "finish_time")
+    private String finishTime;
+    private List<CashLog> logs;
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/CashDetailItem.java

@@ -1,15 +0,0 @@
-package com.sckw.payment.model.dto.wallet;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-@Data
-public class CashDetailItem implements Serializable {
-    @Serial
-    private static final long serialVersionUID = 7233982475006805580L;
-    private String color;
-    private String title;
-    private String value;
-}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/CashLog.java

@@ -0,0 +1,22 @@
+package com.sckw.payment.model.dto.wallet;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class CashLog implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 7233982475006805580L;
+    private String orderNo;
+    @JSONField(name = "status")
+    private Integer status;
+    @JSONField(name = "status_label")
+    private String statusLabel;
+    @JSONField(name = "content")
+    private String content;
+    @JSONField(name = "create_time")
+    private String createTime;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/CashDetailVo.java

@@ -1,8 +1,12 @@
 package com.sckw.payment.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * 提现详情信息
  *
@@ -11,10 +15,43 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CashDetailVo extends WalletDetailBase {
+public class CashDetailVo implements MoneyChange {
+    /**
+     * 业务流水号
+     */
+    private String orderNo;
+    /**
+     * 渠道
+     */
+    private String channel;
+    private String channelDict;
+    private String channelLabel;
+
+    private String uid;
+    private String uidName;
     /**
-     * 操作说明
+     * 业务明细
      */
-    private String desc;
+    private Integer status;
+    private String statusLabel;
 
+    /**
+     * 提现金额
+     */
+    private BigDecimal money;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String createTime;
+    /**
+     * 完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String finishTime;
+    /**
+     * 明细
+     */
+    private List<Logs> logs;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/ChargeDetailVo.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,5 +19,7 @@ public class ChargeDetailVo extends WalletDetailBase {
      * 变更后余额
      */
     private BigDecimal balance;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String payTime;
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/Logs.java

@@ -0,0 +1,19 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author xucaiqin
+ * @date 2023-09-21 09:51:56
+ */
+@Getter
+@Setter
+public class Logs {
+    private String orderNo;
+    private String channelLabel;
+    private Integer status;
+    private String statusLabel;
+    private String remark;
+    private String createTime;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/PrePayDetailVo.java

@@ -0,0 +1,23 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 预付详细记录
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 15:43:49
+ */
+@Getter
+@Setter
+public class PrePayDetailVo extends WalletDetailBase {
+    /**
+     * 变更后余额
+     */
+    private BigDecimal balance;
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/WalletDetailBase.java

@@ -5,7 +5,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 钱包详情基础信息
@@ -51,6 +50,5 @@ public class WalletDetailBase implements MoneyChange {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String payTime;
+
 }

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.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.exception.BusinessException;
@@ -35,10 +36,11 @@ 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.PrePayPage;
 import com.sckw.payment.model.vo.req.page.RefundPage;
 import com.sckw.payment.model.vo.res.*;
+import com.sckw.payment.utils.DateTimeUtil;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisLockKey;
 import com.sckw.system.api.RemoteSystemService;
@@ -1335,25 +1337,31 @@ public class WalletService {
      * @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);
+        fillPara(moneyPage);
+        PageHelper.startPage(moneyPage.getPage(), moneyPage.getPageSize());
+        List<KwpWalletTransfer> kwpWalletTransfers = kwpWalletTransferMapper.pageList(moneyPage);
+        PageInfo<KwpWalletTransfer> pageInfo = new PageInfo<>(kwpWalletTransfers);
+        ArrayList<WalletDetailBase> res = new ArrayList<>();
+        WalletDetailBase walletDetailBase;
+
+        for (KwpWalletTransfer kwpWalletTransfer : kwpWalletTransfers) {
+            walletDetailBase = new WalletDetailBase();
+            walletDetailBase.setOrderNo(kwpWalletTransfer.getOrderNo());
+            walletDetailBase.setChannel(kwpWalletTransfer.getChannel());
+            walletDetailBase.setChannelDict(ChannelEnum.getDict(kwpWalletTransfer.getChannel()));
+            walletDetailBase.setChannelLabel(ChannelEnum.getDesc(kwpWalletTransfer.getChannel()));
+            walletDetailBase.setUid(kwpWalletTransfer.getUid());
+            walletDetailBase.setUidName(getFirmName(kwpWalletTransfer.getUid()));
+            walletDetailBase.setFilter(kwpWalletTransfer.getFilter());
+            walletDetailBase.setFilterName(getFirmName(kwpWalletTransfer.getFilter()));
+            walletDetailBase.setStatus(kwpWalletTransfer.getStatus());
+            walletDetailBase.setStatusLabel(TransferEnum.getDesc(kwpWalletTransfer.getStatus()));
+            walletDetailBase.setMoney(kwpWalletTransfer.getMoney());
+            walletDetailBase.setRemark(kwpWalletTransfer.getRemark());
+            walletDetailBase.setCreateTime(DateTimeUtil.format(kwpWalletTransfer.getCreateTime()));
+            res.add(walletDetailBase);
+        }
+        return PageRes.build(pageInfo, res);
     }
 
     /**
@@ -1363,25 +1371,36 @@ public class WalletService {
      * @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);
+        if (StringUtils.isNotBlank(moneyPage.getStartCreateTime())) {
+            moneyPage.setStartCreateTime(StringTimeUtil.fillStart(moneyPage.getStartCreateTime()));
+        }
+        if (StringUtils.isNotBlank(moneyPage.getEndCreateTime())) {
+            moneyPage.setEndCreateTime(StringTimeUtil.fillEnd(moneyPage.getEndCreateTime()));
+        }
+        RefundPage refundPage = new RefundPage();
+        BeanUtils.copyProperties(moneyPage, refundPage);
+        PageRes<WalletRefundVo> walletRefundVoPageRes = walletOrderService.queryRefundList(refundPage);
+        List<WalletRefundVo> list = walletRefundVoPageRes.getList();
+        List<WalletDetailBase> res = new ArrayList<>();
+        WalletDetailBase walletDetailBase;
+        for (WalletRefundVo walletRefundVo : list) {
+            walletDetailBase = new WalletDetailBase();
+            walletDetailBase.setOrderNo(walletRefundVo.getOrderNo());
+            walletDetailBase.setChannel(walletRefundVo.getChannel());
+            walletDetailBase.setChannelDict(ChannelEnum.getDict(walletRefundVo.getChannel()));
+            walletDetailBase.setChannelLabel(ChannelEnum.getDesc(walletRefundVo.getChannel()));
+            walletDetailBase.setUid(walletRefundVo.getUid());
+            walletDetailBase.setUidName(getFirmName(walletRefundVo.getUid()));
+            walletDetailBase.setFilter(walletRefundVo.getFilter());
+            walletDetailBase.setFilterName(getFirmName(walletRefundVo.getFilter()));
+            walletDetailBase.setStatus(walletRefundVo.getStatus());
+            walletDetailBase.setStatusLabel(RefundEnum.getDesc(walletRefundVo.getStatus()));
+            walletDetailBase.setMoney(walletRefundVo.getMoney());
+            walletDetailBase.setRemark(walletRefundVo.getRemark());
+            walletDetailBase.setCreateTime(DateTimeUtil.format(walletRefundVo.getCreateTime()));
+            res.add(walletDetailBase);
+        }
+        return new PageRes<>(walletRefundVoPageRes.getPage(), walletRefundVoPageRes.getPageSize(), walletRefundVoPageRes.getSize(), walletRefundVoPageRes.getPages(), res);
     }
 
     /**
@@ -1390,9 +1409,8 @@ public class WalletService {
      * @param moneyPage
      * @return
      */
-    public PageRes<ChargeDetailVo> cashOrder(MoneyPage moneyPage) {
-        ChargeDetailVo chargeDetailVo = new ChargeDetailVo();
-        chargeDetailVo.setBalance(new BigDecimal("0"));
+    public PageRes<WalletDetailBase> cashOrder(MoneyPage moneyPage) {
+        WalletDetailBase chargeDetailVo = new WalletDetailBase();
         chargeDetailVo.setOrderNo("");
         chargeDetailVo.setChannel("");
         chargeDetailVo.setChannelDict("");
@@ -1406,10 +1424,10 @@ public class WalletService {
         chargeDetailVo.setMoney(new BigDecimal("0"));
         chargeDetailVo.setRemark("");
 //        chargeDetailVo.setCreateTime(LocalDateTime.now());
-        List<ChargeDetailVo> objects = new ArrayList<>() {{
+        List<WalletDetailBase> objects = new ArrayList<>() {{
             add(chargeDetailVo);
         }};
-        PageInfo<ChargeDetailVo> objectPageInfo = new PageInfo<>();
+        PageInfo<WalletDetailBase> objectPageInfo = new PageInfo<>();
         return new PageRes<>(objectPageInfo, objects);
     }
 
@@ -1420,25 +1438,36 @@ public class WalletService {
      * @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);
+        if (StringUtils.isNotBlank(moneyPage.getStartCreateTime())) {
+            moneyPage.setStartCreateTime(StringTimeUtil.fillStart(moneyPage.getStartCreateTime()));
+        }
+        if (StringUtils.isNotBlank(moneyPage.getEndCreateTime())) {
+            moneyPage.setEndCreateTime(StringTimeUtil.fillEnd(moneyPage.getEndCreateTime()));
+        }
+        RefundPage refundPage = new RefundPage();
+        BeanUtils.copyProperties(moneyPage, refundPage);
+        PageRes<WalletRefundVo> walletRefundVoPageRes = walletOrderService.queryRefundList(refundPage);
+        List<WalletRefundVo> list = walletRefundVoPageRes.getList();
+        List<WalletDetailBase> res = new ArrayList<>();
+        WalletDetailBase walletDetailBase;
+        for (WalletRefundVo walletRefundVo : list) {
+            walletDetailBase = new WalletDetailBase();
+            walletDetailBase.setOrderNo(walletRefundVo.getOrderNo());
+            walletDetailBase.setChannel(walletRefundVo.getChannel());
+            walletDetailBase.setChannelDict(ChannelEnum.getDict(walletRefundVo.getChannel()));
+            walletDetailBase.setChannelLabel(ChannelEnum.getDesc(walletRefundVo.getChannel()));
+            walletDetailBase.setUid(walletRefundVo.getUid());
+            walletDetailBase.setUidName(getFirmName(walletRefundVo.getUid()));
+            walletDetailBase.setFilter(walletRefundVo.getFilter());
+            walletDetailBase.setFilterName(getFirmName(walletRefundVo.getFilter()));
+            walletDetailBase.setStatus(walletRefundVo.getStatus());
+            walletDetailBase.setStatusLabel(RefundEnum.getDesc(walletRefundVo.getStatus()));
+            walletDetailBase.setMoney(walletRefundVo.getMoney());
+            walletDetailBase.setRemark(walletRefundVo.getRemark());
+            walletDetailBase.setCreateTime(DateTimeUtil.format(walletRefundVo.getCreateTime()));
+            res.add(walletDetailBase);
+        }
+        return new PageRes<>(walletRefundVoPageRes.getPage(), walletRefundVoPageRes.getPageSize(), walletRefundVoPageRes.getSize(), walletRefundVoPageRes.getPages(), res);
     }
 
     /**
@@ -1448,25 +1477,40 @@ public class WalletService {
      * @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);
+        if (StringUtils.isNotBlank(moneyPage.getStartCreateTime())) {
+            moneyPage.setStartCreateTime(StringTimeUtil.fillStart(moneyPage.getStartCreateTime()));
+        }
+        if (StringUtils.isNotBlank(moneyPage.getEndCreateTime())) {
+            moneyPage.setEndCreateTime(StringTimeUtil.fillEnd(moneyPage.getEndCreateTime()));
+        }
+        String uid = moneyPage.getUid();
+        String filter = moneyPage.getFilter();
+        moneyPage.setUid(filter);
+        moneyPage.setFilter(uid);
+        RefundPage refundPage = new RefundPage();
+        BeanUtils.copyProperties(moneyPage, refundPage);
+        PageRes<WalletRefundVo> walletRefundVoPageRes = walletOrderService.queryRefundList(refundPage);
+        List<WalletRefundVo> list = walletRefundVoPageRes.getList();
+        List<WalletDetailBase> res = new ArrayList<>();
+        WalletDetailBase walletDetailBase;
+        for (WalletRefundVo walletRefundVo : list) {
+            walletDetailBase = new WalletDetailBase();
+            walletDetailBase.setOrderNo(walletRefundVo.getOrderNo());
+            walletDetailBase.setChannel(walletRefundVo.getChannel());
+            walletDetailBase.setChannelDict(ChannelEnum.getDict(walletRefundVo.getChannel()));
+            walletDetailBase.setChannelLabel(ChannelEnum.getDesc(walletRefundVo.getChannel()));
+            walletDetailBase.setUid(walletRefundVo.getUid());
+            walletDetailBase.setUidName(getFirmName(walletRefundVo.getUid()));
+            walletDetailBase.setFilter(walletRefundVo.getFilter());
+            walletDetailBase.setFilterName(getFirmName(walletRefundVo.getFilter()));
+            walletDetailBase.setStatus(walletRefundVo.getStatus());
+            walletDetailBase.setStatusLabel(RefundEnum.getDesc(walletRefundVo.getStatus()));
+            walletDetailBase.setMoney(walletRefundVo.getMoney());
+            walletDetailBase.setRemark(walletRefundVo.getRemark());
+            walletDetailBase.setCreateTime(DateTimeUtil.format(walletRefundVo.getCreateTime()));
+            res.add(walletDetailBase);
+        }
+        return new PageRes<>(walletRefundVoPageRes.getPage(), walletRefundVoPageRes.getPageSize(), walletRefundVoPageRes.getSize(), walletRefundVoPageRes.getPages(), res);
     }
 
     /**
@@ -1475,9 +1519,39 @@ public class WalletService {
      * @param cashDetailReq
      * @return
      */
-    public String cashDetail(CashDetailReq cashDetailReq) {
-        payCenterService.withdrawDetail(cashDetailReq.getUid(), cashDetailReq.getOrderNo());
-        return null;
+    public CashDetailVo cashDetail(CashDetailReq cashDetailReq) {
+        R<CashDetail> cashDetailR = payCenterService.withdrawDetail(cashDetailReq.getUid(), cashDetailReq.getOrderNo());
+        if (!cashDetailR.getStatus()) {
+            throw new BusinessException(cashDetailR.getMsg());
+        }
+        CashDetail data = cashDetailR.getData();
+        CashDetailVo cashDetailVo = new CashDetailVo();
+        cashDetailVo.setOrderNo(data.getOrderNo());
+        cashDetailVo.setChannel(data.getChannel());
+        cashDetailVo.setChannelDict(ChannelEnum.getDict(data.getChannel()));
+        cashDetailVo.setChannelLabel(ChannelEnum.getDesc(data.getChannel()));
+        cashDetailVo.setUid(data.getUid());
+        cashDetailVo.setUidName(getFirmName(data.getUid()));
+        cashDetailVo.setStatus(data.getStatus());
+        cashDetailVo.setStatusLabel(data.getStatusLabel());
+        cashDetailVo.setMoney(cashDetailVo.smallMoney(data.getMoney()));
+        cashDetailVo.setCreateTime(data.getCreateTime());
+        cashDetailVo.setFinishTime(data.getFinishTime());
+        List<CashLog> cashLogs = data.getLogs();
+        if (!CollectionUtils.isEmpty(cashLogs)) {
+            List<Logs> collect = cashLogs.stream().map(a -> {
+                Logs logs = new Logs();
+                logs.setOrderNo(a.getOrderNo());
+                logs.setChannelLabel(ChannelEnum.getDesc(data.getChannel()));
+                logs.setStatus(a.getStatus());
+                logs.setStatusLabel(a.getStatusLabel());
+                logs.setRemark(a.getContent());
+                logs.setCreateTime(a.getCreateTime());
+                return logs;
+            }).collect(Collectors.toList());
+            cashDetailVo.setLogs(collect);
+        }
+        return cashDetailVo;
     }
 
     /**
@@ -1501,6 +1575,50 @@ public class WalletService {
         return HttpResult.ok("冻结成功");
     }
 
+    public PageRes<PrePayDetailVo> prePayOrder(MoneyPage moneyPage) {
+        PrePayDetailVo chargeDetailVo = new PrePayDetailVo();
+        chargeDetailVo.setOrderNo("123");
+        chargeDetailVo.setChannel("huifu");
+        chargeDetailVo.setChannelDict("1");
+        chargeDetailVo.setChannelLabel("汇付天下");
+        chargeDetailVo.setUid("kll_001");
+        chargeDetailVo.setUidName("uid名称");
+        chargeDetailVo.setFilter("kll_002");
+        chargeDetailVo.setFilterName("filterName");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("测试");
+        chargeDetailVo.setMoney(new BigDecimal("12"));
+        chargeDetailVo.setRemark("测试");
+        chargeDetailVo.setCreateTime(DateTimeUtil.format(LocalDateTime.now()));
+        List<PrePayDetailVo> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<PrePayDetailVo> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
+    public PageRes<PrePayDetailVo> preReceiveOrder(MoneyPage moneyPage) {
+        PrePayDetailVo chargeDetailVo = new PrePayDetailVo();
+        chargeDetailVo.setOrderNo("123");
+        chargeDetailVo.setChannel("huifu");
+        chargeDetailVo.setChannelDict("1");
+        chargeDetailVo.setChannelLabel("汇付天下");
+        chargeDetailVo.setUid("kll_001");
+        chargeDetailVo.setUidName("uid名称");
+        chargeDetailVo.setFilter("kll_002");
+        chargeDetailVo.setFilterName("filterName");
+        chargeDetailVo.setStatus(0);
+        chargeDetailVo.setStatusLabel("测试");
+        chargeDetailVo.setMoney(new BigDecimal("12"));
+        chargeDetailVo.setRemark("测试");
+        chargeDetailVo.setCreateTime(DateTimeUtil.format(LocalDateTime.now()));
+        List<PrePayDetailVo> objects = new ArrayList<>() {{
+            add(chargeDetailVo);
+        }};
+        PageInfo<PrePayDetailVo> objectPageInfo = new PageInfo<>();
+        return new PageRes<>(objectPageInfo, objects);
+    }
+
     /**
      * 退款处理
      *

sckw-modules/sckw-payment/src/main/resources/mapper/KwpWalletTransferMapper.xml

@@ -1,28 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.payment.dao.KwpWalletTransferMapper">
-  <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpWalletTransfer">
-    <!--@mbg.generated-->
-    <!--@Table kwp_wallet_transfer-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="from_ent" jdbcType="BIGINT" property="fromEnt" />
-    <result column="filter" jdbcType="VARCHAR" property="filter" />
-    <result column="to_ent" jdbcType="BIGINT" property="toEnt" />
-    <result column="channel" jdbcType="VARCHAR" property="channel" />
-    <result column="money" jdbcType="DECIMAL" property="money" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_by" jdbcType="BIGINT" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, order_no, `uid`, from_ent, `filter`, to_ent, channel, money, remark, create_by, 
-    create_time, update_by, update_time, del_flag, `status`
-  </sql>
+    <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpWalletTransfer">
+        <!--@mbg.generated-->
+        <!--@Table kwp_wallet_transfer-->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="uid" jdbcType="VARCHAR" property="uid"/>
+        <result column="from_ent" jdbcType="BIGINT" property="fromEnt"/>
+        <result column="filter" jdbcType="VARCHAR" property="filter"/>
+        <result column="to_ent" jdbcType="BIGINT" property="toEnt"/>
+        <result column="channel" jdbcType="VARCHAR" property="channel"/>
+        <result column="money" jdbcType="DECIMAL" property="money"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id,
+        order_no,
+        `uid`,
+        from_ent,
+        `filter`,
+        to_ent,
+        channel,
+        money,
+        remark,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        del_flag,
+        `status`
+    </sql>
+
+    <select id="pageList" resultMap="BaseResultMap">
+        select *
+        from kwp_wallet_transfer kwt
+        <where>
+            kwt.del_flag = 0
+            <if test="moneyPage.channel != null and moneyPage.channel != ''">
+                and kwt.channel = #{moneyPage.channel,jdbcType=VARCHAR}
+            </if>
+            <if test="moneyPage.uid != null and moneyPage.uid != ''">
+                and kwt.uid = #{moneyPage.uid,jdbcType=VARCHAR}
+            </if>
+            <if test="moneyPage.filter != null and moneyPage.filter != ''">
+                and kwt.filter = #{moneyPage.filter,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
 </mapper>