From a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 25 七月 2019 12:20:01 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 4988bef..a1731be 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
@@ -80,12 +80,12 @@
@Resource
private UserMoneyDetailService userMoneyDetailService;
-
+
@Resource
private UserInfoDeleteRecordService userInfoDeleteRecordService;
-
+
@Resource
- private UserAccountService userAccountService;
+ private UserAccountService userAccountService;
/**
* 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃 姝ｅ父鐢ㄦ埛/寮傚父鐢ㄦ埛
@@ -363,7 +363,7 @@
* @param out
*/
@RequestMapping(value = "forbiddenUser")
- public void forbiddenUser(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
+ public void forbiddenUser(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
try {
if (uid == null) {
@@ -381,12 +381,11 @@
if (admin == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐧诲綍澶辨晥,璇风櫥褰�"));
return;
- }
-
+ }
+
String reason = "鍚庡彴灏佺锛屾搷浣滀汉锛�" + admin.getId() + "-" + admin.getName();
userAccountService.forbiddenUserAll(uid, reason);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鐢ㄦ埛灏佺鎴愬姛"));
} catch (Exception e) {
@@ -764,7 +763,6 @@
}
try {
-
List<UserMoneyDetail> userMoneyDetailsList = userMoneyDetailService.listByUidWithState(uid, pageIndex,
pageSize);
if (userMoneyDetailsList == null || userMoneyDetailsList.size() == 0) {
@@ -772,18 +770,15 @@
return;
}
- List<AccountDetails> detailList = new ArrayList<>();
- for (UserMoneyDetail detail : userMoneyDetailsList)
- detailList.add(AccountDetailsFactory.create(detail));
-
long count = userMoneyDetailService.countByUidWithState(uid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+ Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
JSONObject data = new JSONObject();
data.put("pe", pe);
- data.put("result_list", GsonUtil.toJsonExpose(detailList));
+ data.put("result_list", gson.toJson(userMoneyDetailsList));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0