From f06a592dd1a7e995bf313ccb5efe7dff73ccfc4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 四月 2023 18:25:52 +0800
Subject: [PATCH] 增加本地获取IP归属地/广告优化
---
src/main/java/com/yeshi/buwan/controller/admin/api/VipAdminController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/admin/api/VipAdminController.java b/src/main/java/com/yeshi/buwan/controller/admin/api/VipAdminController.java
index 8091281..3892084 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/api/VipAdminController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/api/VipAdminController.java
@@ -3,8 +3,9 @@
import com.google.gson.*;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.domain.vip.UserVIPInfo;
-import com.yeshi.buwan.domain.vip.VIPOrderRecord;
+import com.yeshi.buwan.domain.vip.OrderRecord;
import com.yeshi.buwan.service.inter.LoginUserService;
+import com.yeshi.buwan.service.inter.order.OrderService;
import com.yeshi.buwan.service.inter.vip.VIPService;
import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.StringUtil;
@@ -31,6 +32,9 @@
@Resource
private VIPService vipService;
+
+ @Resource
+ private OrderService orderService;
@Resource
private LoginUserService loginUserService;
@@ -106,14 +110,14 @@
Integer state = null;
if (pay != null) {
if (pay) {
- state = VIPOrderRecord.STATE_PAY;
+ state = OrderRecord.STATE_PAY;
} else {
- state = VIPOrderRecord.STATE_NOT_PAY;
+ state = OrderRecord.STATE_NOT_PAY;
}
}
- List<VIPOrderRecord> list = vipService.listOrderRecord(uid, state, page, Constant.pageCount);
- long count = vipService.countOrderRecord(uid, state);
+ List<OrderRecord> list = orderService.listOrderRecord(uid,null, state, page, Constant.pageCount);
+ long count = orderService.countOrderRecord(uid,null, state);
JSONObject data = new JSONObject();
data.put("pageEntity", new PageEntity(page, Constant.pageCount, (int) count));
data.put("list", getGson().toJson(list));
--
Gitblit v1.8.0