From 621852b97817fec5ae49cba443cb6d7e6069d3ca Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 17:22:06 +0800
Subject: [PATCH] 云发单教程跳转bug
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 115 ++++++++++++++++++++++++++-------------------------------
1 files changed, 53 insertions(+), 62 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 f8a877c..8317664 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
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.IPUtil;
@@ -41,6 +42,7 @@
import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.integral.IntegralDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
@@ -455,85 +457,74 @@
*/
@RequestMapping(value = "getInfoDetail")
public void getInfoDetail(String callback, Long uid, PrintWriter out) {
- JSONObject data = new JSONObject();
+
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
- data.put("phone", user.getPhone());
- data.put("state", user.getState());
- data.put("createtime", user.getCreatetime());
+ UserInfoVO userInfoVO = new UserInfoVO();
+ userInfoVO.setPhone(user.getPhone());
+ userInfoVO.setState(user.getState());
+ userInfoVO.setCreatetime(user.getCreatetime());
-
- String mark = "";
- String activation = "鏈縺娲�";
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null) {
if (!StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
- mark = userInfoExtra.getMark();
+ userInfoVO.setMark( userInfoExtra.getMark());
}
-
- String inviteCode = userInfoExtra.getInviteCode();
- if (!StringUtil.isNullOrEmpty(inviteCode)) {
- activation = "宸叉縺娲�";
- } else {
- activation = "鏈縺娲�";
- }
+ userInfoVO.setInviteCode(userInfoExtra.getInviteCode());
+ userInfoVO.setInviteCodeVip(userInfoExtra.getInviteCodeVip());
}
- data.put("mark", mark);
- data.put("activation", activation);
// 鏈�杩戜竴娆′笅鍗曟椂闂�
- String orderTime = "";
Date lastOrderTime = hongBaoV2CountService.getLastHongBaoTime(uid);
if (lastOrderTime != null) {
- orderTime = TimeUtil.formatDate(lastOrderTime);
+ userInfoVO.setLastOrderTime(lastOrderTime.getTime());
}
- data.put("orderTime", orderTime);
-
// 鏈�杩戠櫥褰曟椂闂�
- String activeTime = "";
UserActiveLog userActiveLog = userActiveLogService.getUserLatestActiveInfo(uid);
if (userActiveLog != null) {
- activeTime = TimeUtil.formatDate(userActiveLog.getCreateTime());
+ userInfoVO.setLastLoginTime(userActiveLog.getCreateTime().getTime());
}
- data.put("activeTime", activeTime);
-//
-// // 鏄剧ず鐢ㄦ埛寰俊 娣樺疂 鑰佺増鏈瓨鍦�
-// String wxUnionId = userInfoVO.getWxUnionId();
-// if (wxUnionId == null || wxUnionId.trim().length() == 0) {
-// userInfoVO.setWxName(null);
-// }
-//
-// // 鏄惁缁戝畾鏀粯瀹濓紙璐拱 + 鍒嗕韩鏉冮檺锛�
-// String taoBaoUid = userInfoVO.getTaoBaoUid();
-// String tbSpecialId = userInfoVO.getTbSpecialId();
-// String tbRelationId = userInfoVO.getTbRelationId();
-// if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(tbSpecialId)
-// || StringUtil.isNullOrEmpty(tbRelationId)) {
-// userInfoVO.setTbName(null);
-// userInfoVO.setTaoBaoUid(null);
-// }
-//
-// Long uid = userInfoVO.getId();
-// /* 缁戝畾鏀舵璐﹀彿淇℃伅 */
-// List<BindingAccount> account = bindingAccountMapper.selectByUid(uid);
-// if (account != null && account.size() > 0) {
-// BindingAccount bindingAccount = account.get(0);
-// Integer type = bindingAccount.getType();
-// if (type != null && type == 1) {
-// // 鏀粯瀹�
-// userInfoVO.setAccountAlipay(bindingAccount.getAccount());
-// userInfoVO.setAccountName(bindingAccount.getName());
-// userInfoVO.setAccountBindId(bindingAccount.getId());
-//
-// } else if (type != null && type == 2) {
-// // 寰俊
-// userInfoVO.setAccountWX(bindingAccount.getAccount());
-// userInfoVO.setAccountNameWX(bindingAccount.getName());
-// userInfoVO.setAccountBindIdWX(bindingAccount.getId());
-// }
-// }
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ // 鏄剧ず鐢ㄦ埛寰俊 娣樺疂 鑰佺増鏈瓨鍦�
+ String wxUnionId = user.getWxUnionId();
+ if (wxUnionId == null || wxUnionId.trim().length() == 0) {
+ user.setWxName(null);
+ }
+ user.setWxName(user.getWxUnionId());
+
+
+ // 鏄惁缁戝畾鏀粯瀹濓紙璐拱 + 鍒嗕韩鏉冮檺锛�
+ UserExtraTaoBaoInfo extraTaoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ String taoBaoUid = extraTaoBaoInfo.getTaoBaoUid();
+ String specialId = extraTaoBaoInfo.getSpecialId();
+ String relationId = extraTaoBaoInfo.getRelationId();
+ if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(specialId)
+ || StringUtil.isNullOrEmpty(relationId)) {
+ userInfoVO.setTbName(null);
+ userInfoVO.setTaoBaoUid(null);
+ } else {
+ userInfoVO.setTbName(extraTaoBaoInfo.getTaoBaoNickName());
+ userInfoVO.setTaoBaoUid(extraTaoBaoInfo.getTaoBaoUid());
+ }
+
+ /* 缁戝畾鏀舵璐﹀彿淇℃伅 */
+ List<BindingAccount> account = bindingAccountService.getBindingAccountByUid(uid);
+ if (account != null && account.size() > 0) {
+ BindingAccount bindingAccount = account.get(0);
+ Integer type = bindingAccount.getType();
+ if (type != null && type == 1) {
+ // 鏀粯瀹�
+ userInfoVO.setAccountAlipay(bindingAccount.getAccount());
+ userInfoVO.setAccountName(bindingAccount.getName());
+ userInfoVO.setAccountBindId(bindingAccount.getId());
+ } else if (type != null && type == 2) {
+ // 寰俊
+ userInfoVO.setAccountWX(bindingAccount.getAccount());
+ userInfoVO.setAccountNameWX(bindingAccount.getName());
+ userInfoVO.setAccountBindIdWX(bindingAccount.getId());
+ }
+ }
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(userInfoVO));
}
--
Gitblit v1.8.0