From fc4ac8cd0bc42f2c15d50a06d03c3e27cbac6e5f Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 21 Nov 2025 16:23:49 +0800 Subject: [PATCH 1/2] =?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/controller/cash/MessageController.java | 4 ++-- src/main/java/com/example/demo/mapper/cash/MessageMapper.java | 2 +- .../java/com/example/demo/service/cash/MessageService.java | 3 ++- .../com/example/demo/serviceImpl/cash/MessageServiceImpl.java | 4 ++-- src/main/resources/cashMapper/MessageMapper.xml | 10 +++------- 5 files changed, 10 insertions(+), 13 deletions(-) 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 e83ff91..19288ca 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -38,7 +38,7 @@ public class MessageController { @Autowired private MarketService marketService; @PostMapping - public Result getMessage() throws Exception { + public Result getMessage(@RequestParam Integer status) throws Exception { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); @@ -51,7 +51,7 @@ public class MessageController { if (markets.contains("9") || markets.contains("9999")) { markets=null; } - return Result.success(messageService.getMessage(markets)); + return Result.success(messageService.getMessage(markets, status)); } @PostMapping("/update") public Result update(@RequestBody IdRequest idRequest) throws Exception { 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 2d72f29..450c0d4 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); + List getMessage(List markets, Integer 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 6194b8a..c90a995 100644 --- a/src/main/java/com/example/demo/service/cash/MessageService.java +++ b/src/main/java/com/example/demo/service/cash/MessageService.java @@ -1,6 +1,7 @@ package com.example.demo.service.cash; import com.example.demo.domain.vo.coin.Messages; +import com.stripe.model.tax.Registration; import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +16,7 @@ import java.util.List; **/ @Service public interface MessageService { - List getMessage(List markets); + List getMessage(List markets, Integer 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 b62821c..36a5fda 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java @@ -23,8 +23,8 @@ public class MessageServiceImpl implements MessageService { @Autowired private MessageMapper messageMapper; @Override - public List getMessage(List markets) { - return messageMapper.getMessage(markets) ; + public List getMessage(List markets, Integer status) { + return messageMapper.getMessage(markets, status) ; } @Override diff --git a/src/main/resources/cashMapper/MessageMapper.xml b/src/main/resources/cashMapper/MessageMapper.xml index 602a9ba..f10cb70 100644 --- a/src/main/resources/cashMapper/MessageMapper.xml +++ b/src/main/resources/cashMapper/MessageMapper.xml @@ -11,6 +11,9 @@ FROM message flag=0 + + and status=#{status} + market IN @@ -19,14 +22,7 @@ - - - ORDER BY ${sortField} ${sortOrder} - - ORDER BY cz_time DESC - - \ No newline at end of file From d0f60a4ade0f99fd004543e3b03c9776d0b1e783 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 21 Nov 2025 17:52:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?11.21=20=E6=89=A7=E8=A1=8C=E4=BA=BA?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashRefundController.java | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) 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 37462b4..d3d0281 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -126,27 +126,27 @@ public class CashRefundController { return Result.error("页大小为空！"); } -// 获取传入的市场列表 - List requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null; - -// 权限校验逻辑 - if (markets.contains("9") || markets.contains("9999")) { - // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets - // 如果业务需要，也可以在这里做空值处理 - if (page.getCashRecordDTO() != null) { - // 保持 requestedMarkets 不变，原样接受 - // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null - } - } else { - // 普通用户：必须校验权限 - if (requestedMarkets == null || requestedMarkets.isEmpty()) { - page.getCashRecordDTO().setMarkets(markets); - } - if (!markets.containsAll(requestedMarkets)) { - return Result.error("无权限！请求的市场不在授权范围内。"); - } - // 校验通过，保持 requestedMarkets 不变 - } +//// 获取传入的市场列表 +// List requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null; +// +//// 权限校验逻辑 +// if (markets.contains("9") || markets.contains("9999")) { +// // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets +// // 如果业务需要，也可以在这里做空值处理 +// if (page.getCashRecordDTO() != null) { +// // 保持 requestedMarkets 不变，原样接受 +// // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null +// } +// } else { +// // 普通用户：必须校验权限 +// if (requestedMarkets == null || requestedMarkets.isEmpty()) { +// page.getCashRecordDTO().setMarkets(markets); +// } +// if (!markets.containsAll(requestedMarkets)) { +// return Result.error("无权限！请求的市场不在授权范围内。"); +// } +// // 校验通过，保持 requestedMarkets 不变 +// } return Result.success(refundService.exSelect(page.getPageNum(), page.getPageSize(), page.getCashRecordDTO())); } /**