From 768267fd2132f0bdb87950d47d14287a5eb28257 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 4 Feb 2026 10:39:51 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java | 3 ++- .../wallet/controller/act/ActCancelItemController.java | 6 +++++- .../wallet/controller/act/ActCouponRecordController.java | 6 +++++- .../wallet/service/impl/act/ActCancelItemServiceImpl.java | 6 +++++- .../wallet/service/impl/act/ActCouponRecordServiceImpl.java | 6 +++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java index 982e9aca5..ec115f598 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/act/ActUserReceiveEnum.java @@ -16,7 +16,8 @@ public enum ActUserReceiveEnum { ACT_EXPIRED("1", "活动不在进行中"), ACT_NOT_EXIST("2", "活动不存在"), ACT_NOT_STARTED("3", "活动未开启"), - USER_LIMIT_REACHED("4", "用户参加活动已达上限"), + // 用户参加活动已达上限 + USER_LIMIT_REACHED("4", "已领取,核销码在我的礼券中"), USER_CANNOT_PARTICIPATE("5", "用户不能参加此活动"), OTHER_ERROR("6", "其他错误"), USER_CAN_JOIN_ACT("99", "用户可以参加活动"), diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java index 2cb94957b..a3714cc6a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java @@ -61,7 +61,11 @@ public class ActCancelItemController { PjcloudUser user = SecurityUtils.getUser(); ActCancelItemDto dto = new ActCancelItemDto(); dto.setReceiverUserId(user.getId()); - dto.setActStatusList(List.of(ActCancelStatusEnum.CANCEL_AWAIT.getCode())); + dto.setActStatusList(List.of( + ActCancelStatusEnum.CANCEL_AWAIT.getCode(), + ActCancelStatusEnum.CANCEL_SUCCESS.getCode(), + ActCancelStatusEnum.CANCEL_EXPIRE.getCode() + )); dto.setIsFindNoExpire(true); return R.ok(actCancelItemService.pageList(page, dto)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java index 371eef0f5..573604353 100755 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java @@ -61,7 +61,11 @@ public class ActCouponRecordController { PjcloudUser user = SecurityUtils.getUser(); ActCouponRecordDto dto = new ActCouponRecordDto(); dto.setUserId(user.getId()); - dto.setStatusCodeList(List.of(ActCouponRecordStatusEnum.UNUSED.getCode())); + dto.setStatusCodeList(List.of( + ActCouponRecordStatusEnum.UNUSED.getCode(), + ActCouponRecordStatusEnum.USED.getCode(), + ActCouponRecordStatusEnum.EXPIRED.getCode() + )); dto.setIsFindNoExpire(true); return R.ok(actCouponRecordService.pageList(page, dto)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java index 20763c230..fd20c29e8 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java @@ -368,7 +368,11 @@ public class ActCancelItemServiceImpl extends ServiceImpl list) { From d25929e46156ccdb31267773457104f615836077 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 4 Feb 2026 15:04:33 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat=EF=BC=9A=E6=89=B9=E9=87=8F=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WalletTransactionController.java | 25 ++++++++----------- .../service/WalletTransactionService.java | 2 +- .../impl/WalletTransactionServiceImpl.java | 25 ++++++++++++++----- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index 3b37287be..063e454a2 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -252,10 +252,9 @@ public class WalletTransactionController { DataScope dataScope = null; Long count = walletTransactionMapper.count(dto, dataScope); - if (count > 5000) throw new RuntimeException("导出数据超出5000条，请缩小查询范围"); + if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - List list = walletTransactionService.scopeList(dto, dataScope); - walletTransactionService.exportByTemplate(response, dto, "file/个人充值明细.xlsx", list); + walletTransactionService.exportByTemplate(response, dto, "file/个人充值明细.xlsx", dataScope); } @Operation(summary = "充值统计", description = "充值统计") @@ -276,10 +275,9 @@ public class WalletTransactionController { DataScope dataScope = null; Long count = walletTransactionMapper.count(dto, dataScope); - if (count > 5000) throw new RuntimeException("导出数据超出5000条，请缩小查询范围"); + if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - List list = walletTransactionService.scopeList(dto, dataScope); - walletTransactionService.exportByTemplate(response, dto, "file/个人记账扣款明细.xlsx", list); + walletTransactionService.exportByTemplate(response, dto, "file/个人记账扣款明细.xlsx", dataScope); } @Operation(summary = "记账扣款统计", description = "记账扣款统计") @@ -300,10 +298,9 @@ public class WalletTransactionController { DataScope dataScope = null; Long count = walletTransactionMapper.count(dto, dataScope); - if (count > 5000) throw new RuntimeException("导出数据超出5000条，请缩小查询范围"); + if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - List list = walletTransactionService.scopeList(dto, dataScope); - walletTransactionService.exportByTemplate(response, dto, "file/个人消费明细.xlsx", list); + walletTransactionService.exportByTemplate(response, dto, "file/个人消费明细.xlsx", dataScope); } @Operation(summary = "消费统计", description = "消费统计") @@ -323,10 +320,9 @@ public class WalletTransactionController { DataScope dataScope = null; Long count = walletTransactionMapper.count(dto, dataScope); - if (count > 5000) throw new RuntimeException("导出数据超出5000条，请缩小查询范围"); + if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - List list = walletTransactionService.scopeList(dto, dataScope); - walletTransactionService.exportByTemplate(response, dto, "file/个人退款明细.xlsx", list); + walletTransactionService.exportByTemplate(response, dto, "file/个人退款明细.xlsx", dataScope); } @Operation(summary = "退款统计", description = "退款统计") @@ -347,10 +343,9 @@ public class WalletTransactionController { DataScope dataScope = null; Long count = walletTransactionMapper.count(dto, dataScope); - if (count > 5000) throw new RuntimeException("导出数据超出5000条，请缩小查询范围"); + if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - List list = walletTransactionService.scopeList(dto, dataScope); - walletTransactionService.exportByTemplate(response, dto, "file/退还各自食堂明细.xlsx", list); + walletTransactionService.exportByTemplate(response, dto, "file/退还各自食堂明细.xlsx", dataScope); } @Operation(summary = "退还各自食堂统计", description = "退还各自食堂统计") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java index 99eeb0657..aa64d50c9 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java @@ -67,7 +67,7 @@ public interface WalletTransactionService extends IService list); + void exportByTemplate(HttpServletResponse response, WalletTransactionDto dto, String fileName, DataScope dataScope); /** * 后台充值统计(导出) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index 7369a6f21..02b2e3e06 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -315,8 +315,10 @@ public class WalletTransactionServiceImpl extends ServiceImpl list) { + public void exportByTemplate(HttpServletResponse response, WalletTransactionDto dto, String fileName, DataScope dataScope) { try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream(fileName)).build()) { WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); @@ -326,9 +328,17 @@ public class WalletTransactionServiceImpl extends ServiceImpl pageList = scopePageList(new Page(currentPage, pageSize), dto, dataScope); + if (ObjectUtil.isEmpty(pageList) || ObjectUtil.isEmpty(pageList.getRecords())) break; + List list = pageList.getRecords(); + // 处理excel start for (WalletTransactionVo v : list) { v.setLineNumber(lineNumber); lineNumber++; @@ -340,10 +350,13 @@ public class WalletTransactionServiceImpl extends ServiceImpl Date: Wed, 4 Feb 2026 15:58:13 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix:=E5=A4=9A=E7=BA=BF=E7=A8=8B=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WalletTransactionController.java | 10 +-- .../service/WalletTransactionService.java | 2 +- .../impl/WalletTransactionServiceImpl.java | 70 +++++++++++++------ 3 files changed, 54 insertions(+), 28 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index 063e454a2..11315614e 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -254,7 +254,7 @@ public class WalletTransactionController { Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - walletTransactionService.exportByTemplate(response, dto, "file/个人充值明细.xlsx", dataScope); + walletTransactionService.exportByTemplate(response, dto, count, "file/个人充值明细.xlsx", dataScope); } @Operation(summary = "充值统计", description = "充值统计") @@ -277,7 +277,7 @@ public class WalletTransactionController { Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - walletTransactionService.exportByTemplate(response, dto, "file/个人记账扣款明细.xlsx", dataScope); + walletTransactionService.exportByTemplate(response, dto, count, "file/个人记账扣款明细.xlsx", dataScope); } @Operation(summary = "记账扣款统计", description = "记账扣款统计") @@ -300,7 +300,7 @@ public class WalletTransactionController { Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - walletTransactionService.exportByTemplate(response, dto, "file/个人消费明细.xlsx", dataScope); + walletTransactionService.exportByTemplate(response, dto, count, "file/个人消费明细.xlsx", dataScope); } @Operation(summary = "消费统计", description = "消费统计") @@ -322,7 +322,7 @@ public class WalletTransactionController { Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - walletTransactionService.exportByTemplate(response, dto, "file/个人退款明细.xlsx", dataScope); + walletTransactionService.exportByTemplate(response, dto, count, "file/个人退款明细.xlsx", dataScope); } @Operation(summary = "退款统计", description = "退款统计") @@ -345,7 +345,7 @@ public class WalletTransactionController { Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - walletTransactionService.exportByTemplate(response, dto, "file/退还各自食堂明细.xlsx", dataScope); + walletTransactionService.exportByTemplate(response, dto, count, "file/退还各自食堂明细.xlsx", dataScope); } @Operation(summary = "退还各自食堂统计", description = "退还各自食堂统计") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java index aa64d50c9..05a25fa45 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java @@ -67,7 +67,7 @@ public interface WalletTransactionService extends IService>> futures = new ArrayList<>(); + for (int i = 1; i <= pages; i++) { + long currentPage = i; + futures.add(CompletableFuture.supplyAsync(() -> { + RequestContextHolder.setRequestAttributes(requestAttributes); + Page pageList = scopePageList(new Page<>(currentPage, pageSize), dto, dataScope); + if (ObjectUtil.isEmpty(pageList) || ObjectUtil.isEmpty(pageList.getRecords())) { + return new ArrayList<>(); + } + List list = pageList.getRecords(); + for (WalletTransactionVo v : list) { + if (ObjectUtil.isNotEmpty(v.getPrice())) { + v.setPriceStr(BigDecimal.valueOf(v.getPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + } + if (ObjectUtil.isNotEmpty(v.getBizType())) { + v.setBizType(WalletBizEnum.valueOfByType(v.getBizType()).getDesc()); + } + } + return list; + }, executor)); + } BigDecimal priceTotal = BigDecimal.ZERO; Long lineNumber = 1L; - // 轮训导出 - while (true) { - Page pageList = scopePageList(new Page(currentPage, pageSize), dto, dataScope); - if (ObjectUtil.isEmpty(pageList) || ObjectUtil.isEmpty(pageList.getRecords())) break; - List list = pageList.getRecords(); - // 处理excel start - for (WalletTransactionVo v : list) { - v.setLineNumber(lineNumber); - lineNumber++; - if (ObjectUtil.isNotEmpty(v.getPrice())) { - priceTotal = priceTotal.add(BigDecimal.valueOf(v.getPrice())); - v.setPriceStr(BigDecimal.valueOf(v.getPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); - } - if (ObjectUtil.isNotEmpty(v.getBizType())) { - v.setBizType(WalletBizEnum.valueOfByType(v.getBizType()).getDesc()); + + for (CompletableFuture> future : futures) { + try { + List list = future.get(); + if (ObjectUtil.isEmpty(list)) continue; + for (WalletTransactionVo v : list) { + v.setLineNumber(lineNumber++); + if (ObjectUtil.isNotEmpty(v.getPrice())) { + priceTotal = priceTotal.add(BigDecimal.valueOf(v.getPrice())); + } } + excelWriter.fill(list, fillConfig, writeSheet); + } catch (Exception e) { + log.error("|{}|多线程导出获取数据异常", TAG, e); } - excelWriter.fill(list, fillConfig, writeSheet); - // 处理excel end - if (pageList.getTotal() < pageSize) break; - currentPage++; } map.put("computeTotalPayPrice", priceTotal.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); excelWriter.fill(map, writeSheet); } catch (IOException e) { e.printStackTrace(); log.error("|{}|导入错误,dto:|{}|,fileName:|{}|,error:|{}|", TAG, JSON.toJSONString(dto), fileName, e.getMessage()); + } finally { + executor.shutdown(); } } From cc19707f29bd9a74740e45776551897b95577619 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 4 Feb 2026 16:28:45 +0800 Subject: [PATCH 04/12] 11 --- .../wallet/controller/WalletTransactionController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index 11315614e..f9b8ed9ac 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.wallet.controller; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; @@ -32,6 +33,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.concurrent.TimeUnit; /** * 会员钱包流水表 @@ -254,6 +256,12 @@ public class WalletTransactionController { Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); + try { + ThreadUtil.sleep(10000, TimeUnit.SECONDS); + } catch (Exception e) { + + } + walletTransactionService.exportByTemplate(response, dto, count, "file/个人充值明细.xlsx", dataScope); } From 642c616d2385bce63f0290bc1df6a7c0c22c774d Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 4 Feb 2026 16:42:40 +0800 Subject: [PATCH 05/12] 111 --- .../WalletTransactionController.java | 7 ---- .../impl/WalletTransactionServiceImpl.java | 33 ++++++++++++------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index f9b8ed9ac..f9e362697 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -255,13 +255,6 @@ public class WalletTransactionController { DataScope dataScope = null; Long count = walletTransactionMapper.count(dto, dataScope); if (count > 3 * 10000) throw new RuntimeException("导出数据超出30000条，请缩小查询范围"); - - try { - ThreadUtil.sleep(10000, TimeUnit.SECONDS); - } catch (Exception e) { - - } - walletTransactionService.exportByTemplate(response, dto, count, "file/个人充值明细.xlsx", dataScope); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index 69491c685..3affbd64a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -67,6 +67,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; + /** * 会员钱包流水表 * @@ -333,7 +336,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl { - RequestContextHolder.setRequestAttributes(requestAttributes); - Page pageList = scopePageList(new Page<>(currentPage, pageSize), dto, dataScope); - if (ObjectUtil.isEmpty(pageList) || ObjectUtil.isEmpty(pageList.getRecords())) { - return new ArrayList<>(); + if (requestAttributes != null) { + RequestContextHolder.setRequestAttributes(requestAttributes); } - List list = pageList.getRecords(); - for (WalletTransactionVo v : list) { - if (ObjectUtil.isNotEmpty(v.getPrice())) { - v.setPriceStr(BigDecimal.valueOf(v.getPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + try { + Page pageList = scopePageList(new Page<>(currentPage, pageSize), dto, dataScope); + if (ObjectUtil.isEmpty(pageList) || ObjectUtil.isEmpty(pageList.getRecords())) { + return new ArrayList<>(); } - if (ObjectUtil.isNotEmpty(v.getBizType())) { - v.setBizType(WalletBizEnum.valueOfByType(v.getBizType()).getDesc()); + List list = pageList.getRecords(); + for (WalletTransactionVo v : list) { + if (ObjectUtil.isNotEmpty(v.getPrice())) { + v.setPriceStr(BigDecimal.valueOf(v.getPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + } + if (ObjectUtil.isNotEmpty(v.getBizType())) { + v.setBizType(WalletBizEnum.valueOfByType(v.getBizType()).getDesc()); + } } + return list; + } finally { + RequestContextHolder.resetRequestAttributes(); } - return list; }, executor)); } From fb246dc2e4ca9514a9ba53bc4307476488cbe5dd Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 4 Feb 2026 17:10:10 +0800 Subject: [PATCH 06/12] 122 --- .../service/impl/WalletTransactionServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index 3affbd64a..2887e224f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -326,7 +326,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl Date: Thu, 5 Feb 2026 09:19:16 +0800 Subject: [PATCH 07/12] 1111 --- .../wallet/service/impl/WalletTransactionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index 2887e224f..a00715916 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -326,7 +326,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl Date: Thu, 5 Feb 2026 09:28:06 +0800 Subject: [PATCH 08/12] =?UTF-8?q?feat:=E6=9C=80=E5=A4=A7=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/service/impl/WalletTransactionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index a00715916..b540adbd6 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -336,7 +336,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl Date: Thu, 5 Feb 2026 09:41:37 +0800 Subject: [PATCH 09/12] 11 --- .../wallet/service/impl/WalletTransactionServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index b540adbd6..707d5c220 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -336,7 +336,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl pageList = scopePageList(new Page<>(currentPage, pageSize), dto, dataScope); + Page page = new Page<>(currentPage, pageSize); + page.setMaxLimit(pageSize); + Page pageList = scopePageList(page, dto, dataScope); if (ObjectUtil.isEmpty(pageList) || ObjectUtil.isEmpty(pageList.getRecords())) { return new ArrayList<>(); } From 46c9ce83251a3b80720f7a329e09891cb96dcfa2 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 5 Feb 2026 15:31:05 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat:=E4=BD=99=E9=A2=9D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WalletManageMapper.xml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml index c8acb41e5..83c892c8a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml @@ -193,14 +193,21 @@ + + + + + + + +