From c952838555e557097f84a47624bc2860e0a2d9a8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 30 六月 2020 15:50:46 +0800
Subject: [PATCH] 云发单异步 + 首单
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 18 +++++++++++-------
1 files changed, 11 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 688c866..0aa4fc2 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
@@ -538,12 +538,16 @@
JSONObject data = new JSONObject();
Integer state = user.getState();
- if (state == UserInfo.STATE_FORBIDDEN) {
- data.put("state", false);
- } else {
- data.put("state", true);
+ if (state == UserInfo.STATE_NORMAL) {
+ data.put("stateDesc", "姝ｅ父");
+ } else if (state == UserInfo.STATE_DELETE) {
+ data.put("stateDesc", "宸插垹闄�");
+ } else if (state == UserInfo.STATE_FORBIDDEN) {
+ data.put("stateDesc", "宸插皝绂�");
+ } else if (state == UserInfo.STATE_DELETE_OUT_OF_DATE) {
+ data.put("stateDesc", "闀挎湡鏈櫥褰曞垹闄�");
}
-
+ data.put("state", state);
data.put("phone", user.getPhone());
// 寰俊鎺堟潈
@@ -592,10 +596,10 @@
// 鏀粯瀹�
if (type != null && type == 1) {
accountState = true;
- accountName = bindingAccount.getName();
+ accountName = bindingAccount.getAccount();
}
}
- data.put("accountName", accountName);
+ data.put("account", accountName);
data.put("accountState", accountState);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0