From ed018ec2ec54520c9632d19414986e3063f4da57 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 21 Nov 2025 18:34:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?11.21=20=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/MessageController.java | 5 +++-- .../com/example/demo/domain/vo/cash/Status.java | 22 ++++++++++++++++++++++ .../example/demo/mapper/cash/MessageMapper.java | 2 +- .../example/demo/service/cash/MessageService.java | 2 +- .../demo/serviceImpl/cash/MessageServiceImpl.java | 2 +- src/main/resources/cashMapper/MessageMapper.xml | 13 +++++++++---- 6 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/vo/cash/Status.java diff --git a/src/main/java/com/example/demo/controller/cash/MessageController.java b/src/main/java/com/example/demo/controller/cash/MessageController.java index 19288ca..127f114 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -3,6 +3,7 @@ package com.example.demo.controller.cash; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.DTO.IdRequest; import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.vo.cash.Status; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.cash.MessageService; import com.example.demo.service.coin.MarketService; @@ -38,7 +39,7 @@ public class MessageController { @Autowired private MarketService marketService; @PostMapping - public Result getMessage(@RequestParam Integer status) throws Exception { + public Result getMessage(@RequestBody Status status) throws Exception { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); @@ -51,7 +52,7 @@ public class MessageController { if (markets.contains("9") || markets.contains("9999")) { markets=null; } - return Result.success(messageService.getMessage(markets, status)); + return Result.success(messageService.getMessage(markets, status.getStatus())); } @PostMapping("/update") public Result update(@RequestBody IdRequest idRequest) throws Exception { diff --git a/src/main/java/com/example/demo/domain/vo/cash/Status.java b/src/main/java/com/example/demo/domain/vo/cash/Status.java new file mode 100644 index 0000000..e68fe7d --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/cash/Status.java @@ -0,0 +1,22 @@ +package com.example.demo.domain.vo.cash; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName Status + * @description: + * @author: huangqizhen + * @create: 2025−11-21 18:32 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Status { + private List status; +} diff --git a/src/main/java/com/example/demo/mapper/cash/MessageMapper.java b/src/main/java/com/example/demo/mapper/cash/MessageMapper.java index 450c0d4..81cd7c8 100644 --- a/src/main/java/com/example/demo/mapper/cash/MessageMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/MessageMapper.java @@ -16,7 +16,7 @@ import java.util.List; **/ @Mapper public interface MessageMapper { - List getMessage(List markets, Integer status); + List getMessage(List markets, List status); void update(Integer id); } diff --git a/src/main/java/com/example/demo/service/cash/MessageService.java b/src/main/java/com/example/demo/service/cash/MessageService.java index c90a995..8e51301 100644 --- a/src/main/java/com/example/demo/service/cash/MessageService.java +++ b/src/main/java/com/example/demo/service/cash/MessageService.java @@ -16,7 +16,7 @@ import java.util.List; **/ @Service public interface MessageService { - List getMessage(List markets, Integer status); + List getMessage(List markets, List status); void update(Integer id) throws Exception; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java index 36a5fda..cffadd4 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java @@ -23,7 +23,7 @@ public class MessageServiceImpl implements MessageService { @Autowired private MessageMapper messageMapper; @Override - public List getMessage(List markets, Integer status) { + public List getMessage(List markets, List status) { return messageMapper.getMessage(markets, status) ; } diff --git a/src/main/resources/cashMapper/MessageMapper.xml b/src/main/resources/cashMapper/MessageMapper.xml index f10cb70..268e0fd 100644 --- a/src/main/resources/cashMapper/MessageMapper.xml +++ b/src/main/resources/cashMapper/MessageMapper.xml @@ -11,12 +11,17 @@ FROM message flag=0 - - and status=#{status} - + + + and status IN + + #{item} + + + - market IN + and market IN #{item} From 6c3c3779fccca9247a2670c2c1232f92f49d69ab Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 21 Nov 2025 19:44:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?11-21=20=E6=94=B6=E6=AC=BE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8C=89=E7=85=A7=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/cashMapper/CashCollectionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index c49a2a3..032fe3e 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -198,7 +198,7 @@ ORDER BY ${cashCollection.sortField} ${cashCollection.sortOrder} - ORDER BY pay_time DESC + ORDER BY create_time DESC From 624e32eb8d754872265fb4c0e9e1c61a55e7897f Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 21 Nov 2025 19:49:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?11.21=20=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/domain/vo/coin/Messages.java | 1 + .../demo/mapper/cash/CashCollectionMapper.java | 4 +- src/main/resources/cashMapper/MessageMapper.xml | 49 +++++++++++++--------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/coin/Messages.java b/src/main/java/com/example/demo/domain/vo/coin/Messages.java index 462dc56..ae4942e 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Messages.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Messages.java @@ -32,6 +32,7 @@ public class Messages { private Integer typeId; private Integer market; private Integer flag; + private String marketName; } diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 1d086b4..afc1b9c 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -1,6 +1,6 @@ package com.example.demo.mapper.cash; -import com.example.demo.domain.DTO.PaymentDTO; +//import com.example.demo.domain.DTO.PaymentDTO; import com.example.demo.domain.entity.CashRecord; import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.entity.RechargeActivity; @@ -61,5 +61,5 @@ public interface CashCollectionMapper { //根据glodcoin订单号查询收款订单 CashCollection selectByGoldCoinOrderCode(String orderNo); - void updateByGoldCoinOrderCode(PaymentDTO paymentDTO); +// void updateByGoldCoinOrderCode(PaymentDTO paymentDTO); } diff --git a/src/main/resources/cashMapper/MessageMapper.xml b/src/main/resources/cashMapper/MessageMapper.xml index 268e0fd..8be0aaf 100644 --- a/src/main/resources/cashMapper/MessageMapper.xml +++ b/src/main/resources/cashMapper/MessageMapper.xml @@ -7,27 +7,36 @@ where id=#{id} \ No newline at end of file From 882bc6a0d7e7c54affed782855c09039cbbe8d97 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 21 Nov 2025 21:12:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?11-21=20=E6=97=B6=E9=97=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/cash/CashCollection.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 7e75c41..d0e1179 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -1,5 +1,6 @@ package com.example.demo.domain.vo.cash; +import cn.hutool.core.date.DateTime; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; @@ -113,10 +114,10 @@ public class CashCollection implements Serializable { //搜索筛条件 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime startTime; // 付款时间起 + private DateTime startTime; // 付款时间起 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime endTime; // 付款时间止 + private DateTime endTime; // 付款时间止 @ExcelIgnore private String sortField; //排序字段 @ExcelIgnore From f362db23123903cbb9afdb326242b4a661e2d1a3 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 21 Nov 2025 21:48:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?11-21=20=E6=97=B6=E9=97=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/cash/CashCollection.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index d0e1179..2903b9d 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -103,10 +104,10 @@ public class CashCollection implements Serializable { private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime createTime; + private Date createTime; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime updateTime; + private Date updateTime; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime auditTime; @@ -114,10 +115,10 @@ public class CashCollection implements Serializable { //搜索筛条件 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private DateTime startTime; // 付款时间起 + private LocalDateTime startTime; // 付款时间起 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private DateTime endTime; // 付款时间止 + private LocalDateTime endTime; // 付款时间止 @ExcelIgnore private String sortField; //排序字段 @ExcelIgnore From a0eac14737b8a294e0c05a6c8a84647523be3214 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 21 Nov 2025 22:29:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?11-21=20=E6=97=B6=E9=97=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=A7=E7=BB=AD=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/cash/CashCollection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 2903b9d..322615d 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -98,7 +98,7 @@ public class CashCollection implements Serializable { private String rejectReason; // 驳回理由 @ExcelIgnore private String auditId; //审核人id - @ExcelProperty("审核人") + @ExcelProperty("审核人" ) private String auditName; //审核人姓名 @ExcelIgnore private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) @@ -115,10 +115,10 @@ public class CashCollection implements Serializable { //搜索筛条件 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime startTime; // 付款时间起 + private Date startTime; // 付款时间起 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime endTime; // 付款时间止 + private Date endTime; // 付款时间止 @ExcelIgnore private String sortField; //排序字段 @ExcelIgnore