From 82338b6e270a3a10ba68fb55b68b2b75bca1f386 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Thu, 9 Apr 2026 14:56:43 +0800 Subject: [PATCH] =?UTF-8?q?20260409=20=E9=92=B1=E5=8C=85=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=8C=BA=E7=AD=9B=E9=80=89=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/cash/CashCollectionController.java | 9 +++++---- .../java/com/example/demo/domain/entity/UserWalletRecord.java | 1 + .../java/com/example/demo/mapper/cash/CashCollectionMapper.java | 3 ++- .../com/example/demo/service/cash/CashCollectionService.java | 3 +-- .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 4 ++-- src/main/resources/cashMapper/CashCollectionMapper.xml | 3 +++ 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 65aad69..3d884d6 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -339,18 +339,19 @@ public class CashCollectionController { UserWalletRecord queryCondition = page.getUserWalletRecord(); if (queryCondition == null || - (queryCondition.getJwcode() == null && queryCondition.getWalletId() == null)) { - return Result.error("精网号和钱包 ID 不能同时为空"); + (queryCondition.getJwcode() == null && queryCondition.getWalletId() == null && + (queryCondition.getMarket() == null || queryCondition.getMarket().isEmpty()))) { + return Result.error("精网号、钱包 ID 和地区不能同时为空"); } Result result = Result.success(cashCollectionService.selectWalletRecordsByJwcodeAndWalletId( page.getPageNum(), page.getPageSize(), queryCondition.getJwcode(), - queryCondition.getWalletId() + queryCondition.getWalletId(), + queryCondition.getMarket() )); - // 对返回结果进行多语言转换 if (result.getCode() == 200 && result.getData() instanceof PageInfo) { PageInfo pageInfo = (PageInfo) result.getData(); translateWalletRecordVOs(pageInfo, lang); diff --git a/src/main/java/com/example/demo/domain/entity/UserWalletRecord.java b/src/main/java/com/example/demo/domain/entity/UserWalletRecord.java index 60e4365..1728aa2 100644 --- a/src/main/java/com/example/demo/domain/entity/UserWalletRecord.java +++ b/src/main/java/com/example/demo/domain/entity/UserWalletRecord.java @@ -13,6 +13,7 @@ import java.util.Date; public class UserWalletRecord { private Integer id; // 主键 ID private Integer jwcode; // 精网号 + private String market; // 地区 private Integer walletId; // 钱包 ID private Integer type; // 交易类型（0=充值，1=消耗，2=退款，3=软件购买） private String transactionCurrency; // 交易币种 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 0f5ff2f..907faac 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -113,7 +113,8 @@ public interface CashCollectionMapper { // 根据精网号和钱包 ID 查询用户钱包明细列表 List selectWalletRecordsByJwcodeAndWalletId( @Param("jwcode") Integer jwcode, - @Param("walletId") Integer walletId); + @Param("walletId") Integer walletId, + @Param("market") String market); // 查询符合条件的精网号列表（用于分页，每个精网号算一条记录） List selectDistinctJwcodes(@Param("jwcode") Integer jwcode, diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index 2cdcabf..f57218c 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -51,8 +51,7 @@ public interface CashCollectionService { // 根据精网号和钱包 ID 查询用户钱包明细列表（分页） PageInfo selectWalletRecordsByJwcodeAndWalletId( - Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId); - + Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId, String market); // 根据精网号和地区查询用户的所有钱包 ID 和金币数量（包含用户名和地区）（分页） PageInfo selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize, String sortField, String sortOrder, Integer sortWalletId); // 添加流水--其他收入 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 2cba3a6..ee22a06 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -620,9 +620,9 @@ public class CashCollectionServiceImpl implements CashCollectionService { // 根据精网号和钱包 ID 查询用户钱包明细列表（分页） @Override public PageInfo selectWalletRecordsByJwcodeAndWalletId( - Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId) { + Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId, String market) { PageHelper.startPage(pageNum, pageSize); - List records = cashCollectionMapper.selectWalletRecordsByJwcodeAndWalletId(jwcode, walletId); + List records = cashCollectionMapper.selectWalletRecordsByJwcodeAndWalletId(jwcode, walletId, market); return new PageInfo<>(records); } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 9326a50..ff26d94 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -522,6 +522,9 @@ AND uwr.wallet_id = #{walletId} + + AND u.market = #{market} + ORDER BY uwr.create_time DESC