From a217652d33c75df23202828000d82d0ca8555ac2 Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期一, 21 四月 2025 02:13:59 +0800
Subject: [PATCH] 初步完成积分后台管理相关页面

---
 src/main/java/com/taoke/autopay/factory/OrderFactory.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/factory/OrderFactory.java b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
index 21b4df4..ff3c906 100644
--- a/src/main/java/com/taoke/autopay/factory/OrderFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
@@ -1,11 +1,13 @@
 package com.taoke.autopay.factory;
 
+import com.google.gson.Gson;
 import com.taoke.autopay.entity.ClientInfo;
 import com.taoke.autopay.entity.KeyOrder;
 import com.taoke.autopay.entity.OrderChannelEnum;
 import com.taoke.autopay.entity.WxUserOrderCount;
 import com.taoke.autopay.entity.agent.ChannelAgent;
 import com.taoke.autopay.utils.Constant;
+import com.taoke.autopay.utils.IPUtil;
 import com.taoke.autopay.utils.StringUtil;
 import com.taoke.autopay.utils.TimeUtil;
 import com.taoke.autopay.utils.order.OrderChannelUtil;
@@ -112,6 +114,11 @@
         OrderChannelEnum orderChannel=OrderChannelUtil.getChannelByKey(order.getOrderChannel());
         vo.setOrderChannel(orderChannel==null?"鏈煡":orderChannel.getName());
         vo.setPayMerchant(order.getPayMerchant());
+        vo.setIp(order.getIp());
+        vo.setIgnore(order.getIgnore());
+        if(!StringUtil.isNullOrEmpty(order.getIpInfo())){
+            vo.setIpInfo(new Gson().fromJson(order.getIpInfo(), IPUtil.IPInfo.class));
+        }
         if(agent!=null){
             vo.setAgent(agent.getName());
         }else{

--
Gitblit v1.8.0