diff --git a/src/main/java/com/example/demo/domain/DTO/WalletDTO.java b/src/main/java/com/example/demo/domain/DTO/WalletDTO.java index db73ef6..9dcdb5a 100644 --- a/src/main/java/com/example/demo/domain/DTO/WalletDTO.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index ecf3bfc..44b927a 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/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 roles = new HashSet<>(); // 用户角色集合 + @ExcelIgnore + private List walletList; // 钱包列表 + public boolean hasRole(String role) { return roles != null && roles.contains(role); } diff --git a/src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java b/src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java index 739856f..211e7d8 100644 --- a/src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java +++ b/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 getWalletDTOList(String jwcode); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java index fcc480e..e39e6ee 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java +++ b/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 getGold(Integer pageNum, Integer pageSize, User user) { PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper - List list = goldDetailMapper.getGold(user); + // 为每个用户填充钱包列表 + for(User u : list) { + if(u != null && u.getJwcode() != null) { + List walletList = goldDetailMapper.getWalletDTOList(String.valueOf(u.getJwcode())); + u.setWalletList(walletList); + } + } return new PageInfo<>(list); } diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index a123213..bf10ccd 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -268,4 +268,17 @@ + + +