20260409 钱包明细添加地区筛选查询

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<UserWalletRecordVO> pageInfo = (PageInfo<UserWalletRecordVO>) result.getData();
                 translateWalletRecordVOs(pageInfo, lang);

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;   // 交易币种

src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java

@@ -113,7 +113,8 @@ public interface CashCollectionMapper {
     // 根据精网号和钱包 ID 查询用户钱包明细列表
     List<UserWalletRecordVO> selectWalletRecordsByJwcodeAndWalletId(
             @Param("jwcode") Integer jwcode,
-            @Param("walletId") Integer walletId);
+            @Param("walletId") Integer walletId,
+            @Param("market") String market);
 
     // 查询符合条件的精网号列表（用于分页，每个精网号算一条记录）
     List<Integer> selectDistinctJwcodes(@Param("jwcode") Integer jwcode,

src/main/java/com/example/demo/service/cash/CashCollectionService.java

@@ -51,8 +51,7 @@ public interface CashCollectionService {
 
     // 根据精网号和钱包 ID 查询用户钱包明细列表（分页）
     PageInfo<UserWalletRecordVO> selectWalletRecordsByJwcodeAndWalletId(
-            Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId);
-
+            Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId, String market);
     // 根据精网号和地区查询用户的所有钱包 ID 和金币数量（包含用户名和地区）（分页）
     PageInfo<UserWalletVO> selectUserWallets(Integer jwcode, String market, Integer pageNum, Integer pageSize, String sortField, String sortOrder, Integer sortWalletId);
     // 添加流水--其他收入

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -620,9 +620,9 @@ public class CashCollectionServiceImpl implements CashCollectionService {
     // 根据精网号和钱包 ID 查询用户钱包明细列表（分页）
     @Override
     public PageInfo<UserWalletRecordVO> selectWalletRecordsByJwcodeAndWalletId(
-            Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId) {
+            Integer pageNum, Integer pageSize, Integer jwcode, Integer walletId, String market) {
         PageHelper.startPage(pageNum, pageSize);
-        List<UserWalletRecordVO> records = cashCollectionMapper.selectWalletRecordsByJwcodeAndWalletId(jwcode, walletId);
+        List<UserWalletRecordVO> records = cashCollectionMapper.selectWalletRecordsByJwcodeAndWalletId(jwcode, walletId, market);
         return new PageInfo<>(records);
     }
 

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -522,6 +522,9 @@
             <if test="walletId != null">
                 AND uwr.wallet_id = #{walletId}
             </if>
+            <if test="market != null and market != ''">
+                AND u.market = #{market}
+            </if>
         </where>
         ORDER BY uwr.create_time DESC
     </select>