From fd1dce3121a7773419263c495f92e160cc1e7124 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 11:36:36 +0800
Subject: [PATCH] 2.1 +后台编辑
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 146 ++++++++++++++----------------------------------
1 files changed, 44 insertions(+), 102 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 1e4aeb9..b0bc74e 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
@@ -26,13 +26,13 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.bus.user.UserActiveNumHistory;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.integral.IntegralDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserRankService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
@@ -102,6 +103,9 @@
@Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private IntegralDetailService integralDetailService;
/**
@@ -1241,115 +1245,53 @@
/**
- * 璁″綋澶╂椿璺冪敤鎴蜂腑鏈夊灏戜釜鐢ㄦ埛鏄�90澶╁墠鎵嶆椿璺冭繃锛屾湡闂翠粠鏈椿璺冪殑鐢ㄦ埛鏁伴噺
+ * 鑾峰彇閲戝竵鎺掕姒�
* @param callback
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
+ * @param pageIndex
+ * @param pageSize
+ * @param type
* @param out
*/
- @RequestMapping(value = "getUserActiveCharts")
- public void getUserActiveCharts(String callback, Integer dateType, String year, String startTime,
- String endTime, PrintWriter out){
- try {
- String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
-
- Date beginDate = null;
- Date endDate = null;
-
- if (dateType == 1) {
- beginDate = TimeUtil.parse(startTime);
- endDate = TimeUtil.parse(endTime);
- } else if (dateType == 2) {
- Calendar calendar=Calendar.getInstance();
- int currentYear = calendar.get(Calendar.YEAR);
- if (!StringUtil.isNullOrEmpty(year)) {
- currentYear = Integer.parseInt(year);
- }
-
- calendar.clear();
- calendar.set(Calendar.YEAR, currentYear);
- beginDate =calendar.getTime();
+ @RequestMapping(value = "getGoldCoinRecord")
+ public void getGoldCoinRecord(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ if (pageIndex == null)
+ pageIndex = 1;
- calendar.clear();
- calendar.set(Calendar.YEAR, currentYear);
- calendar.roll(Calendar.DAY_OF_YEAR, -1);
- endDate=calendar.getTime();
- } else if (dateType == 3) {
- beginDate = TimeUtil.parse("2018-01-01");
- endDate = new Date();
- }
- Gson gson = new Gson();
- List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
- List<Object> list = new ArrayList<>();
- List<UserActiveNumHistory> listHistory = userActiveLogService.query(beginDate, endDate);
- for (String date: dateList) {
- ChartTDO chartTDO = new ChartTDO();
- chartTDO.setShowDate(date);
- int value = 0;
-
- if (listHistory != null) {
- for (UserActiveNumHistory history: listHistory) {
- if (dateType == 1) {
- String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
- if (gernalTime.equalsIgnoreCase(date)) {
- value += history.getNum();
- continue;
- }
- } else if (dateType == 2){
- String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
- if(gernalTime.startsWith("0")) {
- gernalTime = gernalTime.substring(1, 2);
- }
- if (gernalTime.equalsIgnoreCase(date)) {
- value += history.getNum();
- continue;
- }
- } else if (dateType == 3) {
- String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
- if (gernalTime.equalsIgnoreCase(date)) {
- value += history.getNum();
- continue;
- }
- }
- }
- }
-
- chartTDO.setShowValue(value + "");
- list.add(value + "");
- }
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", "鏁伴噺");
- innerList.put("data", gson.toJson(list));
-
- JSONArray line_list = new JSONArray();
- line_list.add(innerList);
-
- JSONObject data = new JSONObject();
- data.put("xAxis_list", gson.toJson(dateList));
- data.put("line_list", line_list);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
+ if (pageSize == null)
+ pageSize = 20;
+
+ List<IntegralDetail> list = integralDetailService.listQuery((pageIndex-1)* pageSize, pageSize, key);
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧淇℃伅"));
+ return;
}
+
+ for (IntegralDetail integralDetail: list) {
+ Long uid = integralDetail.getUid();
+ UserInfo userInfo = userInfoService.getUserById(uid);
+ if (userInfo != null) {
+ integralDetail.setNickName(userInfo.getNickName());
+ integralDetail.setPortrait(userInfo.getPortrait());
+ }
+ }
+
+ long count = integralDetailService.countQuery(key);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("list", gson.toJson(list));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
+
/**
*
* @param callback
--
Gitblit v1.8.0