Merge remote-tracking branch 'origin/milestone-20260224-现金钱包' into milestone-20260224-现金钱包

src/main/java/com/example/demo/domain/DTO/WalletDTO.java

@@ -19,6 +19,8 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @AllArgsConstructor
 public class WalletDTO {
-    private Integer id; //钱包id
+    private Integer id;
+    private String walletName; //钱包名称
+    private Integer walletId;
     private BigDecimal permanentGold;
 }

src/main/java/com/example/demo/domain/entity/User.java

@@ -2,6 +2,7 @@ package com.example.demo.domain.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.example.demo.domain.DTO.WalletDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
@@ -69,6 +70,9 @@ public class User implements Serializable {
     private Integer UserFlag;//是否员工号
     @ExcelIgnore
     private Set<String> roles = new HashSet<>(); // 用户角色集合
+    @ExcelIgnore
+    private List<WalletDTO> walletList; // 钱包列表
+
     public boolean hasRole(String role) {
         return roles != null && roles.contains(role);
     }

src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java

@@ -1,5 +1,6 @@
 package com.example.demo.mapper.coin;
 
+import com.example.demo.domain.DTO.WalletDTO;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.coin.Gold;
 import com.example.demo.domain.vo.coin.GoldDetail;
@@ -46,4 +47,5 @@ public interface GoldDetailMapper {
             @Param("fileName") String fileName,
             @Param("dataNum") Integer dataNum
     );
+    List<WalletDTO> getWalletDTOList(String jwcode);
 }

src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java

@@ -5,6 +5,7 @@ import com.example.demo.Util.LanguageTranslationUtil;
 import com.example.demo.Util.RedisUtil;
 import com.example.demo.domain.DTO.GoldDetailDTO;
 import com.example.demo.domain.DTO.GoldUserDTO;
+import com.example.demo.domain.DTO.WalletDTO;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.User;
 import com.example.demo.exception.SystemException;
@@ -66,8 +67,14 @@ public class GoldDetailServiceImpl implements GoldDetailService {
     @Override
     public PageInfo<User> getGold(Integer pageNum, Integer pageSize, User user) {
         PageHelper.startPage(pageNum, pageSize);     //必须要直接跟mapper
-
         List<User> list = goldDetailMapper.getGold(user);
+        // 为每个用户填充钱包列表
+        for(User u : list) {
+            if(u != null && u.getJwcode() != null) {
+                List<WalletDTO> walletList = goldDetailMapper.getWalletDTOList(String.valueOf(u.getJwcode()));
+                u.setWalletList(walletList);
+            }
+        }
         return new PageInfo<>(list);
     }
 

src/main/resources/mapper/GoldDetailMapper.xml

@@ -268,4 +268,17 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getWalletDTOList" resultType="com.example.demo.domain.DTO.WalletDTO">
+        SELECT
+            urw.id,
+            w.wallet_name,
+            urw.wallet_id,
+            ROUND(IFNULL(urw.current_permanent_gold, 0) / 100.0, 2) AS permanentGold
+        FROM user_region_wallet urw
+        left join wallet w on w.id=urw.wallet_id
+        WHERE urw.jwcode = #{jwcode}
+        ORDER BY urw.wallet_id
+    </select>
 </mapper>