From 5af10f175689549ca44b74e9fc1c7ee0ec92c2d7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 21 四月 2020 14:26:38 +0800
Subject: [PATCH] 后台改造
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 198 +++++-------------------------------------------
1 files changed, 23 insertions(+), 175 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 eb21b3c..31a69d5 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
@@ -55,6 +55,7 @@
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.invite.UserInviteValidRecordService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.tag.PageEntity;
@@ -114,6 +115,7 @@
private IntegralDetailService integralDetailService;
+
/**
* 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃 姝ｅ父鐢ㄦ埛/寮傚父鐢ㄦ埛
*
@@ -135,8 +137,8 @@
*/
@RequestMapping(value = "query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,
- Integer days, String startTime, String endTime, Integer orderMode, Integer type, PrintWriter out) {
-
+ Integer days, String startTime, String endTime, Integer orderMode, Integer type,String level,
+ Integer activeCode, PrintWriter out) {
try {
if (type == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛绫诲瀷type涓嶈兘涓虹┖"));
@@ -184,14 +186,14 @@
}
List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,
- userRank, days, startTime, endTime, orderField, orderMode,userType);
+ userRank, days, startTime, endTime, orderField, orderMode,userType, level, activeCode);
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
}
- long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType);
+ long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -203,9 +205,7 @@
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("resultList", gson.toJson(userList));
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
@@ -289,9 +289,7 @@
long monthUser = userInfoCountService.countNewUser(null, 1);
data.put("todayUser", todayUser);
data.put("monthUser", monthUser);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
@@ -416,7 +414,6 @@
@RequestMapping(value = "deleteUser")
public void delete(String callback, String idArray, HttpServletRequest request, PrintWriter out) {
try {
-
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
if (admin == null) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
@@ -460,7 +457,6 @@
@RequestMapping(value = "forbiddenUser")
public void forbiddenUser(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
try {
-
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
return;
@@ -480,9 +476,7 @@
String reason = "鍚庡彴灏佺锛屾搷浣滀汉锛�" + admin.getId() + "-" + admin.getName();
userAccountService.forbiddenUserAll(uid, reason);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鐢ㄦ埛灏佺鎴愬姛"));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
@@ -499,7 +493,6 @@
@RequestMapping(value = "relieveForbiddenUser")
public void relieveForbiddenUser(String callback, Long uid, PrintWriter out) {
try {
-
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
return;
@@ -546,9 +539,7 @@
forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
}
}
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鐢ㄦ埛瑙ｅ皝鎴愬姛"));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
@@ -573,9 +564,7 @@
}
forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
} catch (ForbiddenUserIdentifyCodeException e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -585,157 +574,7 @@
}
}
- /**
- * 鍒犻櫎闃熷憳鍏崇郴
- *
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "deleteThreeSale")
- public void deleteThreeSale(String callback, Long id, PrintWriter out) {
- try {
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
- return;
- }
-
- int count = threeSaleService.deleteByPrimaryKey(id);
-
- if (count > 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- } else {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- }
- }
-
- @RequestMapping(value = "queryMyFirstTeams")
- public void queryMyFirstTeams(String callback, Integer pageIndex, Integer pageSize, String key, Long bossId,
- PrintWriter out) {
- try {
-
- if (bossId == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
- return;
- }
-
- if (pageIndex == null)
- pageIndex = 1;
-
- if (pageSize == null)
- pageSize = Constant.PAGE_SIZE;
-
- List<ThreeSale> firstTeamList = threeSaleService.queryMyFirstTeamList((pageIndex - 1) * pageSize, pageSize,
- key, bossId);
- if (firstTeamList == null || firstTeamList.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤涓�搴﹂槦鍛�"));
- return;
- }
-
- /* 鑾峰彇閭�璇风敤鎴峰ご鍍� 銆佹樀绉� */
- for (ThreeSale threeSale : firstTeamList) {
- UserInfo worker = threeSale.getWorker();
- if (worker == null) {
- worker = new UserInfo();
- threeSale.setWorker(worker);
- } else {
- Long id = worker.getId();
-
- UserInfo currentInfo = userInfoService.selectByPKey(id);
- if (currentInfo != null) {
- worker.setNickName(currentInfo.getNickName());
- worker.setPortrait(currentInfo.getPortrait());
- }
- }
- }
-
- long count = threeSaleService.queryCountMyFirstTeamList(key, bossId);
-
- 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.create();
-
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("list", gson.toJson(firstTeamList));
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- }
- }
-
- @RequestMapping(value = "queryMySecondTeams")
- public void queryMySecondTeams(String callback, Integer pageIndex, Integer pageSize, String key, Long bossId,
- PrintWriter out) {
- try {
-
- if (bossId == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
- return;
- }
-
- if (pageIndex == null)
- pageIndex = 1;
-
- if (pageSize == null)
- pageSize = Constant.PAGE_SIZE;
-
- List<ThreeSale> firstTeamList = threeSaleService.queryMySecondTeamList((pageIndex - 1) * pageSize, pageSize,
- key, bossId);
- if (firstTeamList == null || firstTeamList.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤浜屽害闃熷憳"));
- return;
- }
-
- /* 鑾峰彇閭�璇风敤鎴峰ご鍍� 銆佹樀绉� */
- for (ThreeSale threeSale : firstTeamList) {
- UserInfo worker = threeSale.getWorker();
- if (worker == null) {
- worker = new UserInfo();
- threeSale.setWorker(worker);
- } else {
- Long id = worker.getId();
-
- UserInfo currentInfo = userInfoService.selectByPKey(id);
- if (currentInfo != null) {
- worker.setNickName(currentInfo.getNickName());
- worker.setPortrait(currentInfo.getPortrait());
- }
- }
- }
-
- long count = threeSaleService.queryCountMySecondTeamList(key, bossId);
-
- 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.create();
-
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("list", gson.toJson(firstTeamList));
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- }
- }
+
/**
* 闃熷憳鍏崇郴
@@ -749,7 +588,7 @@
*/
@RequestMapping(value = "getRelationList")
public void getRelationList(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer type,
- Integer state, String startTime, String endTime, PrintWriter out) {
+ Integer state, String startTime, String endTime, Integer validState, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -781,11 +620,11 @@
} else if (type == 1) {
// 涓�绾х敤鎴�
listQuery = threeSaleService.listFirstTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, state,
- startTime, endTime);
+ startTime, endTime, validState);
} else if (type == 2) {
// 浜岀骇鐢ㄦ埛
listQuery = threeSaleService.listSecondTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, state,
- startTime, endTime);
+ startTime, endTime, validState);
}
if (listQuery == null || listQuery.size() == 0) {
@@ -794,6 +633,14 @@
}
for (ThreeSale threeSale : listQuery) {
+ // 鐢ㄦ埛淇℃伅
+ UserInfo boss = threeSale.getBoss();
+ threeSale.setBoss(userInfoService.selectByPKey(boss.getId()));
+
+ UserInfo worker = threeSale.getWorker();
+ threeSale.setWorker(userInfoService.selectByPKey(worker.getId()));
+
+
Integer expire = threeSale.getExpire();
if (threeSale.getState()) {
threeSale.setExpire(1); // 閭�璇锋垚鍔�
@@ -805,6 +652,9 @@
}
}
}
+
+
+
long count = 0;
if (type == 0) {
@@ -812,10 +662,10 @@
count = threeSaleService.countSuperiorQuery(state, uid);
} else if (type == 1) {
// 涓�绾х敤鎴�
- count = threeSaleService.countFirstTeamQuery(uid, state, startTime, endTime);
+ count = threeSaleService.countFirstTeamQuery(uid, state, startTime, endTime, validState);
} else if (type == 2) {
// 浜岀骇鐢ㄦ埛
- count = threeSaleService.countSecondTeamQuery(uid, state, startTime, endTime);
+ count = threeSaleService.countSecondTeamQuery(uid, state, startTime, endTime, validState);
}
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -874,9 +724,7 @@
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", gson.toJson(userMoneyDetailsList));
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
--
Gitblit v1.8.0