From 595b7935a30e84fba1bc3561d05f9d19d3e32e1f Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期三, 23 四月 2025 00:45:48 +0800
Subject: [PATCH] 后台管理页面完成
---
src/main/java/com/taoke/autopay/factory/WxUserFactory.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/factory/WxUserFactory.java b/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
index c9863ac..0e2d52f 100644
--- a/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
@@ -1,7 +1,11 @@
package com.taoke.autopay.factory;
+import com.google.gson.Gson;
import com.taoke.autopay.entity.WxUserInfo;
import com.taoke.autopay.entity.WxUserSettings;
+import com.taoke.autopay.entity.credit.UserCreditBalance;
+import com.taoke.autopay.utils.IPUtil;
+import com.taoke.autopay.utils.StringUtil;
import com.taoke.autopay.vo.WxUserOrderSettingVO;
import com.taoke.autopay.vo.WxUserVO;
@@ -13,15 +17,23 @@
*/
public class WxUserFactory {
- public static WxUserVO createVO(WxUserInfo user, WxUserSettings settings) {
+ public static WxUserVO createVO(WxUserInfo user, WxUserSettings settings, UserCreditBalance balance) {
WxUserVO vo = new WxUserVO();
vo.setId(user.getId());
vo.setCreateTime(user.getCreateTime());
vo.setLoginTime(user.getLoginTime());
vo.setNickName(user.getNickName());
vo.setPortrait(user.getPortrait());
- WxUserOrderSettingVO settingVO = new WxUserOrderSettingVO(settings.getDyOrderCountPerDay(), settings.getKsOrderCountPerDay(), settings.getTotalOrderCountPerDay());
- vo.setOrderSetting(settingVO);
+ vo.setIp(user.getLatestIP());
+ if(!StringUtil.isNullOrEmpty(user.getLatestIPInfo())){
+ vo.setIpInfo(new Gson().fromJson(user.getLatestIPInfo(), IPUtil.IPInfo.class));
+ }
+ vo.setStatus(user.getStatus());
+ vo.setCredit(balance==null?0:balance.getCreditBalance());
+ if(settings!=null) {
+ WxUserOrderSettingVO settingVO = new WxUserOrderSettingVO(settings.getDyOrderCountPerDay(), settings.getKsOrderCountPerDay(), settings.getTotalOrderCountPerDay());
+ vo.setOrderSetting(settingVO);
+ }
return vo;
}
--
Gitblit v1.8.0