diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java index 3204432d..081850e0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java @@ -18,6 +18,8 @@ import com.mdd.common.util.UrlUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.LinkedHashMap; +import java.util.Map; /** * 用户余额记录服务实现类 @@ -63,7 +65,10 @@ public class FinanceWalletServiceImpl implements IFinanceWalletService { vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); } - return PageResult.iPageHandle(iPage); + Map extend = new LinkedHashMap<>(); + extend.put("changeType", LogMoneyEnum.getTypeList()); + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords(), extend); } } diff --git a/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java b/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java index e7a2a8a4..21c5e1b4 100644 --- a/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java +++ b/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java @@ -1,5 +1,10 @@ package com.mdd.common.enums; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + public enum LogMoneyEnum { /** @@ -56,4 +61,20 @@ public enum LogMoneyEnum { return null; } + /** + * 根据编码获取Msg + * + * @author fzr + * @return String + */ + public static List> getTypeList(){ + List> list = new LinkedList<>(); + for(LogMoneyEnum enumItem : LogMoneyEnum.values()) { + Map map = new LinkedHashMap<>(); + map.put(enumItem.getCode(), enumItem.getMsg()); + list.add(map); + } + return list; + } + }