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/controller/admin/AdminOrderController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java b/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
index b6a6414..b4ba34c 100644
--- a/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
@@ -17,6 +17,7 @@
import com.taoke.autopay.service.KeyOrderService;
import com.taoke.autopay.service.agent.ChannelAgentService;
import com.taoke.autopay.utils.Constant;
+import com.taoke.autopay.utils.IPUtil;
import com.taoke.autopay.utils.TimeUtil;
import com.taoke.autopay.vo.admin.AdminOrderVO;
import com.taoke.autopay.vo.admin.OrderSearchVO;
@@ -117,6 +118,8 @@
if (!StringUtil.isNullOrEmpty(vo.getEndDate())) {
query.maxCreateTime = TimeUtil.getNextDay(1, new Date(TimeUtil.convertToTimeTemp(vo.getEndDate(), "yyyy-MM-dd")).getTime());
}
+
+ query.ignore = vo.getIgnore();
return query;
@@ -298,6 +301,17 @@
dto.setPayDevice("");
}
dto.setPayMerchant(order.getPayMerchant());
+ if(StringUtil.isNullOrEmpty(order.getIpInfo())) {
+ dto.setArea("");
+ }else{
+ IPUtil.IPInfo ipInfo = gson.fromJson(order.getIpInfo(), IPUtil.IPInfo.class);
+ dto.setArea(String.format("%s/%s",ipInfo.getProvince(),ipInfo.getCity()));
+ }
+ if(order.getIgnore()==null) {
+ dto.setIgnore("鏈煡");
+ }else{
+ dto.setIgnore(order.getIgnore()?"鏄�":"鍚�");
+ }
dataList.add(dto);
}
--
Gitblit v1.8.0