From 8d6f2fe54a4456d6e56c4473b951f773b2b362d8 Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期日, 27 七月 2025 22:58:05 +0800
Subject: [PATCH] 后台管理页面完成

---
 src/main/java/com/taoke/autopay/factory/WxUserFactory.java |   11 ++++++++---
 1 files changed, 8 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 4c63007..0e2d52f 100644
--- a/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
@@ -3,6 +3,7 @@
 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;
@@ -16,7 +17,7 @@
  */
 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());
@@ -27,8 +28,12 @@
         if(!StringUtil.isNullOrEmpty(user.getLatestIPInfo())){
             vo.setIpInfo(new Gson().fromJson(user.getLatestIPInfo(), IPUtil.IPInfo.class));
         }
-        WxUserOrderSettingVO settingVO = new WxUserOrderSettingVO(settings.getDyOrderCountPerDay(), settings.getKsOrderCountPerDay(), settings.getTotalOrderCountPerDay());
-        vo.setOrderSetting(settingVO);
+        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