新增明细相关接口声明

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

@@ -3,6 +3,9 @@ package com.sckw.payment.controller;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.dto.Id;
 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.service.WalletService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
@@ -296,4 +299,99 @@ public class WalletController {
     public HttpResult back(@RequestBody @Valid RefundBackReq refundReq) {
         return HttpResult.ok(walletService.backRefund(refundReq));
     }
+
+
+
+    /*资金明细-详细记录*/
+
+    /**
+     * 充值订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("rechargeOrder")
+    public HttpResult rechargeList(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.rechargeList(moneyPage));
+    }
+
+    /**
+     * 转账订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("transferOrder")
+    public HttpResult transferList(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.transferOrder(moneyPage));
+    }
+
+    /**
+     * 退款订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("refundOrder")
+    public HttpResult refundOrder(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.refundOrder(moneyPage));
+    }
+
+    /**
+     * 提现订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("cashOrder")
+    public HttpResult cashOrder(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.cashOrder(moneyPage));
+    }
+
+    /*预付-详细记录*/
+
+    /**
+     * 预付订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("prePayOrder")
+    public HttpResult prePayOrder(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.cashOrder(moneyPage));
+    }
+
+    /**
+     * 退款记录
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("prePayRefund")
+    public HttpResult prePayRefund(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.prePayRefund(moneyPage));
+    }
+    /*预收-详细记录*/
+
+    /**
+     * 预收订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("preReceiveOrder")
+    public HttpResult preReceiveOrder(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.cashOrder(moneyPage));
+    }
+
+    /**
+     * 退款订单
+     *
+     * @param moneyPage
+     * @return
+     */
+    @PostMapping("preReceiveRefund")
+    public HttpResult preReceiveRefund(@RequestBody @Valid MoneyPage moneyPage) {
+        return HttpResult.ok(walletService.preReceiveRefund(moneyPage));
+    }
 }

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

@@ -2,7 +2,7 @@ package com.sckw.payment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.model.KwpWalletRefund;
-import com.sckw.payment.model.vo.req.RefundPage;
+import com.sckw.payment.model.vo.req.page.RefundPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/page/MoneyPage.java

@@ -0,0 +1,30 @@
+package com.sckw.payment.model.vo.req.page;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.vo.BasePara;
+import com.sckw.payment.model.vo.res.MoneyChange;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 充值
+ *
+ * @author xucaiqin
+ * @date 2023-08-29 09:14:04
+ */
+@Getter
+@Setter
+public class MoneyPage extends BasePara implements MoneyChange {
+    /**
+     * 支付通道字典值
+     */
+    @NotBlank(message = "支付通道不能为空")
+    private String channel;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String startCreateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String endCreateTime;
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/PrePayPage.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/page/PrePayPage.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.model.vo.req;
+package com.sckw.payment.model.vo.req.page;
 
 import com.sckw.core.model.vo.BasePara;
 import lombok.Getter;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/RefundPage.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/page/RefundPage.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.model.vo.req;
+package com.sckw.payment.model.vo.req.page;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.vo.BasePara;

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

@@ -0,0 +1,22 @@
+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 ApDetailVo extends WalletDetailBase {
+    /**
+     * 变更后预付余额/元
+     */
+    private BigDecimal balanceApMoney;
+
+}

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

@@ -0,0 +1,20 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 提现详情信息
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 15:43:49
+ */
+@Getter
+@Setter
+public class CashDetailVo extends WalletDetailBase {
+    /**
+     * 操作说明
+     */
+    private String desc;
+
+}

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

@@ -0,0 +1,22 @@
+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 ChargeDetailVo extends WalletDetailBase {
+    /**
+     * 变更后余额
+     */
+    private BigDecimal balance;
+
+}

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

@@ -0,0 +1,54 @@
+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.time.LocalDateTime;
+
+/**
+ * 钱包详情基础信息
+ *
+ * @author xucaiqin
+ * @date 2023-08-28 15:43:49
+ */
+@Getter
+@Setter
+public class WalletDetailBase {
+    /**
+     * 业务流水号
+     */
+    private String orderNo;
+    /**
+     * 渠道
+     */
+    private String channel;
+    private String channelDict;
+    private String channelLabel;
+
+    private String uid;
+    private String uidName;
+    /**
+     * 往来单位
+     */
+    private String filter;
+    private String filterName;
+    /**
+     * 业务明细
+     */
+    private Integer status;
+    private String statusLabel;
+
+    /**
+     * 涉及操作金额
+     */
+    private BigDecimal money;
+
+    private String remark;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+}

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

@@ -9,7 +9,7 @@ import com.sckw.payment.dao.KwpWalletRefundMapper;
 import com.sckw.payment.dao.KwpWalletTransferMapper;
 import com.sckw.payment.model.KwpWalletRefund;
 import com.sckw.payment.model.constant.RefundEnum;
-import com.sckw.payment.model.vo.req.RefundPage;
+import com.sckw.payment.model.vo.req.page.RefundPage;
 import com.sckw.payment.model.vo.res.WalletRefundVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;