From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index 5d508ea..ff39df7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -19,7 +19,6 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
-import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
@@ -31,21 +30,20 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
import com.yeshi.fanli.service.inter.count.UserInfoCountService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.user.BindingAccountService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserRankService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
+import com.yeshi.fanli.vo.user.UserGoldCoinVO;
import com.yeshi.fanli.vo.user.UserInfoVO;
import net.sf.json.JSONArray;
@@ -1092,15 +1090,11 @@
/**
- * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
- *
+ * 鑾峰彇閲戝竵鎺掕姒�
* @param callback
- * @param channelArray
- * 娓犻亾鍚嶇О
- * @param startTime
- * @param endTime
- * @param orderNum
- * 璁㈠崟鏁伴噺
+ * @param pageIndex
+ * @param pageSize
+ * @param type
* @param out
*/
@RequestMapping(value = "getGoldTop")
@@ -1111,12 +1105,33 @@
return;
}
-
+ if (pageIndex == null)
+ pageIndex = 1;
+ if (pageSize == null)
+ pageSize = 50;
-
- }
+ long count = 0;
+ List<UserGoldCoinVO> list = null;
+ if (type == 0) {
+ count = userInfoCountService.countByHasGoldCoin();
+ list = userInfoCountService.listByHasGoldCoin((pageIndex - 1) * pageSize, pageSize);
+ } else if (type == 1 || type == 2) {
+ count = userInfoCountService.countByUserGoldCoin(type);
+ list = userInfoCountService.listByUserGoldCoin((pageIndex - 1) * pageSize, pageSize, type);
+ }
+
+ if(list == null)
+ list = new ArrayList<>();
+
-
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("list", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
}
--
Gitblit v1.8.0