From 7ae4a56dbc0de80694e2dde7adc0fd76a93afb2d Mon Sep 17 00:00:00 2001
From: wangguorui <2069821375@qq.com>
Date: Mon, 9 Mar 2026 14:05:26 +0800
Subject: [PATCH] =?UTF-8?q?20260309=20=E9=92=B1=E5=8C=85=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96pro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceImpl/coin/ExportExcelServiceImpl.java   | 44 ++++++++++++++--------
 .../resources/cashMapper/CashCollectionMapper.xml  |  3 +-
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java
index e7c7059..40fa17b 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java
@@ -545,11 +545,25 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                 Integer pageNum = userWalletDTONode.path("page").asInt(1);
                 Integer pageSize = userWalletDTONode.path("pageSize").asInt(20);
 
-                if (!userWalletDTONode.path("jwcode").isMissingNode()) {
-                    jwcode = userWalletDTONode.path("jwcode").asInt();
+                JsonNode jwcodeNode = userWalletDTONode.path("jwcode");
+                if (!jwcodeNode.isMissingNode() && !jwcodeNode.isNull()) {
+                    String jwcodeStr = jwcodeNode.asText();
+                    if (!jwcodeStr.isEmpty()) {
+                        try {
+                            jwcode = Integer.parseInt(jwcodeStr.trim());
+                        } catch (NumberFormatException e) {
+                            // 如果转换失败，保持为 null
+                            log.warn("精网号格式错误：{}", jwcodeStr);
+                        }
+                    }
                 }
-                if (!userWalletDTONode.path("market").isMissingNode()) {
-                    market = userWalletDTONode.path("market").asText();
+
+                JsonNode marketNode = userWalletDTONode.path("market");
+                if (!marketNode.isMissingNode() && !marketNode.isNull()) {
+                    String marketStr = marketNode.asText();
+                    if (!marketStr.isEmpty()) {
+                        market = marketStr.trim();
+                    }
                 }
 
                 // 从请求数据中获取语言设置
@@ -572,18 +586,18 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                         if (vo.getWalletList() != null && !vo.getWalletList().isEmpty()) {
                             // 为每个钱包创建一个独立的 UserWalletVO 对象
                             for (WalletItem wallet : vo.getWalletList()) {
-                                UserWalletVO flatVO = new UserWalletVO();
-                                flatVO.setJwcode(vo.getJwcode());
-                                flatVO.setUserName(vo.getUserName());
-                                flatVO.setMarketName(vo.getMarketName());
-                                flatVO.setWalletId(wallet.getWalletId());
-                                flatVO.setWalletName(wallet.getWalletName());
-                                flatVO.setCurrentPermanentGold(wallet.getCurrentPermanentGold());
-                                flatList.add(flatVO);
+                                // 只添加 walletId 不为 null 的钱包
+                                if (wallet.getWalletId() != null) {
+                                    UserWalletVO flatVO = new UserWalletVO();
+                                    flatVO.setJwcode(vo.getJwcode());
+                                    flatVO.setUserName(vo.getUserName());
+                                    flatVO.setMarketName(vo.getMarketName());
+                                    flatVO.setWalletId(wallet.getWalletId());
+                                    flatVO.setWalletName(wallet.getWalletName());
+                                    flatVO.setCurrentPermanentGold(wallet.getCurrentPermanentGold());
+                                    flatList.add(flatVO);
+                                }
                             }
-                        } else {
-                            // 如果没有钱包，也保留该用户记录
-                            flatList.add(vo);
                         }
                     }
 
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index d16d026..7b3877b 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -468,7 +468,7 @@
         m.name as marketName,
         wr.wallet_id as walletId,
         w.wallet_name as walletName,
-        COALESCE(wr.current_permanent_gold, 0) as currentPermanentGold
+        COALESCE(wr.current_permanent_gold, 0)/100 as currentPermanentGold
         FROM user u
         LEFT JOIN market m ON u.market = m.id
         LEFT JOIN user_region_wallet wr ON u.jwcode = wr.jwcode
@@ -480,6 +480,7 @@
             <if test="market != null and market != ''">
                 AND u.market = #{market}
             </if>
+            AND wr.wallet_id IS NOT NULL
         </where>
         ORDER BY u.jwcode, wr.wallet_id
     </select>