From 5138cf8f821681ef13d6b17ff5a7cf1112295b36 Mon Sep 17 00:00:00 2001
From: admin <1101184511@qq.com>
Date: 星期二, 15 四月 2025 23:00:53 +0800
Subject: [PATCH] 积分相关实体类创建

---
 src/main/java/com/taoke/autopay/factory/WxUserFactory.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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..c956c0e 100644
--- a/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/WxUserFactory.java
@@ -1,7 +1,10 @@
 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.utils.IPUtil;
+import com.taoke.autopay.utils.StringUtil;
 import com.taoke.autopay.vo.WxUserOrderSettingVO;
 import com.taoke.autopay.vo.WxUserVO;
 
@@ -20,8 +23,15 @@
         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());
+        if(settings!=null) {
+            WxUserOrderSettingVO settingVO = new WxUserOrderSettingVO(settings.getDyOrderCountPerDay(), settings.getKsOrderCountPerDay(), settings.getTotalOrderCountPerDay());
+            vo.setOrderSetting(settingVO);
+        }
         return vo;
     }
 

--
Gitblit v1.8.0