From 3193e4d407d82168f72976a3cab39d3fc605bb26 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 16 Jan 2026 10:07:38 +0800 Subject: [PATCH] =?UTF-8?q?1.15=20=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashRefundController.java | 6 +++ .../com/example/demo/domain/vo/cash/FundsDTO.java | 47 ++++++++++++++++++++++ .../java/com/example/demo/domain/vo/coin/Page.java | 3 ++ .../example/demo/mapper/cash/CashRefundMapper.java | 3 ++ .../example/demo/service/cash/RefundService.java | 4 +- .../serviceImpl/cash/CashRefundServiceImpl.java | 8 ++++ src/main/resources/cashMapper/CashRefundMapper.xml | 41 +++++++++++++++++++ 7 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java index ad91766..355f73d 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -401,6 +401,12 @@ public class CashRefundController { return Result.success(msg); } + + @PostMapping("/funds") + public Result funds(@RequestBody Page page){ + refundService.funds(page.getPageNum(), page.getPageSize(), page.getFundsDTO()); + return Result.success(refundService.funds(page.getPageNum(), page.getPageSize(), page.getFundsDTO())); + } /** * 辅助方法：获取用户真实IP（处理反向代理/负载均衡场景） */ diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java new file mode 100644 index 0000000..bac675a --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -0,0 +1,47 @@ +package com.example.demo.domain.vo.cash; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @program: GOLD + * @ClassName FundsDTO + * @description: + * @author: huangqizhen + * @create: 2026−01-15 09:21 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FundsDTO { + private Integer id; + private Integer jwcode; + private String name; + private String market; + private List markets; + private String orderCode; + private String paymentCurrency; + private BigDecimal paymentAmount; + private String receivedCurrency; + private BigDecimal receivedAmount; + private BigDecimal handlingCharge; + private String payType; + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date payTime; + private Integer status; + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date startTime; + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date endTime; +} diff --git a/src/main/java/com/example/demo/domain/vo/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index 491d6f2..b320ee6 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -8,6 +8,7 @@ import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.cash.CashRecordDTO; import com.example.demo.domain.vo.cash.CashRecordDone; import com.example.demo.domain.vo.cash.PerformanceVO; +import com.example.demo.domain.vo.cash.FundsDTO; import lombok.Data; import lombok.NoArgsConstructor; @@ -52,6 +53,8 @@ public class Page { private CashRecordDone cashRecordDone; private RechargeActivity rechargeActivity; //充值活动 private CashRecordDTO cashRecordDTO; + private PerformanceDTO performanceDTO;//业绩归属 + private FundsDTO fundsDTO;//现金收款 private PerformanceVO performanceVO;//业绩归属 } diff --git a/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java b/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java index f5b4e4a..fe052f6 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java @@ -38,4 +38,7 @@ public interface CashRefundMapper { List getAuditBatch(Set auditIds); //根据id查订单信息 CashRecordDTO selectById(Integer id); + + List selectfunds(FundsDTO fundsDTO); + int selectRefundCount(Integer id); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/cash/RefundService.java b/src/main/java/com/example/demo/service/cash/RefundService.java index 238a826..608f32c 100644 --- a/src/main/java/com/example/demo/service/cash/RefundService.java +++ b/src/main/java/com/example/demo/service/cash/RefundService.java @@ -3,7 +3,7 @@ package com.example.demo.service.cash; import com.example.demo.domain.vo.cash.CashRecordDTO; import com.example.demo.domain.vo.cash.CashRecordDone; import com.example.demo.domain.vo.cash.CashRecordRefund; -import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.cash.FundsDTO; import com.github.pagehelper.PageInfo; /** @@ -36,4 +36,6 @@ public interface RefundService { PageInfo exSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO); //新增线上退款记录 void addOnline(CashRecordRefund cashRecordRefund); + + PageInfo funds(Integer pageNum, Integer pageSize, FundsDTO fundsDTO); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index c835afa..89bb5f8 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -579,4 +579,12 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); cashRefundMapper.updateStatus(cashRecordDone1); else throw new SystemException("提交失败") ; } + + @Override + public PageInfo funds(Integer pageNum, Integer pageSize, FundsDTO fundsDTO) { + PageHelper.startPage(pageNum, pageSize); + List list = cashRefundMapper.selectfunds(fundsDTO); + return new PageInfo<>(list); + } + } diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 5ee0f15..017a929 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -415,6 +415,47 @@ from cash_record_refund crr where crr.id = #{id} + + \ No newline at end of file