From 143160118ab3937ae9e340f61aafa764756856c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 17 十月 2019 14:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 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 8cd39b1..5609f53 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,6 +26,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSale;
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.common.AdminUser;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
@@ -301,7 +302,7 @@
UserInfo find = userInfoService.getUserById(uid);
if (find == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛锛�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛琚皝绂佹垨涓嶅瓨鍦�"));
return;
}
@@ -347,13 +348,81 @@
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("瑙ｇ粦鎴愬姛"));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
}
+
+
+ /**
+ * 淇敼鐢ㄦ埛澶囨敞
+ * @param callback
+ * @param uid
+ * @param mark
+ * @param out
+ */
+ @RequestMapping("addUserMark")
+ public void addUserMark(String callback, Long uid, String mark, PrintWriter out) {
+ try {
+ if (uid == null || uid <= 0 || StringUtil.isNullOrEmpty(mark))
+ return;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra == null)
+ return;
+ UserInfoExtra updateExtra = new UserInfoExtra();
+ updateExtra.setId(userInfoExtra.getId());
+ updateExtra.setMark(mark);
+ userInfoExtraService.saveUserInfoExtra(updateExtra);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛-鏀瑰彉鍏剁姸鎬�
+ * @param callback
+ * @param idArray
+ * @param out
+ */
+ @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("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(idArray)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+ return;
+ }
+
+ Gson gson = new Gson();
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
+ return;
+ }
+
+ for (Long id: list) {
+ UserInfo user = new UserInfo(id);
+ user.setState(UserInfo.STATE_DELETE);
+ user.setStateDesc(admin.getId()+" " + admin.getName()+ "鍚庡彴鎵嬪姩鍒犻櫎");
+ userInfoService.updateByPrimaryKeySelective(user);
+ }
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+
/**
* 灏佺鐢ㄦ埛ID
*
@@ -1099,7 +1168,7 @@
* @param out
*/
@RequestMapping(value = "getGoldTop")
- public void getGoldTop(String callback, Integer pageIndex, Integer pageSize, Integer type,
+ public void getGoldTop(String callback, Integer pageIndex, Integer pageSize, Integer type, String key,
PrintWriter out) {
if (type == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("type涓嶈兘涓虹┖"));
@@ -1115,11 +1184,11 @@
long count = 0;
List<UserGoldCoinVO> list = null;
if (type == 0) {
- count = userInfoCountService.countByHasGoldCoin();
- list = userInfoCountService.listByHasGoldCoin((pageIndex - 1) * pageSize, pageSize);
+ count = userInfoCountService.countByHasGoldCoin(key);
+ list = userInfoCountService.listByHasGoldCoin((pageIndex - 1) * pageSize, pageSize, key);
} else if (type == 1 || type == 2) {
- count = userInfoCountService.countByUserGoldCoin(type);
- list = userInfoCountService.listByUserGoldCoin((pageIndex - 1) * pageSize, pageSize, type);
+ count = userInfoCountService.countByUserGoldCoin(type, key);
+ list = userInfoCountService.listByUserGoldCoin((pageIndex - 1) * pageSize, pageSize, type, key);
}
if(list == null)
--
Gitblit v1.8.0