From 3579201658f94480a8421507c24d2ece83dbf0c7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 15 六月 2020 14:55:00 +0800
Subject: [PATCH] 云发单相关
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 182 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 157 insertions(+), 25 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 18f2b73..f8a877c 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
@@ -32,11 +32,13 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
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.UserInviteValidNum;
import com.yeshi.fanli.entity.bus.user.UserRank;
+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.integral.IntegralDetail;
@@ -45,6 +47,7 @@
import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.UserInfoCountService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
@@ -58,9 +61,11 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
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.ThreeSaleDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.vip.TearcherService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
@@ -129,6 +134,15 @@
@Resource
private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private TearcherService tearcherService;
+
+ @Resource
+ private ThreeSaleDetailService threeSaleDetailService;
+
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
/**
@@ -380,6 +394,148 @@
e.printStackTrace();
}
}
+
+
+ /**
+ * 鐢ㄦ埛绮変笣缁熻
+ *
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "countTeamFans")
+ public void countTeamFans(String callback, Long uid, PrintWriter out) {
+ JSONObject data = new JSONObject();
+
+ // 瀵煎笀
+ String tearcherName = "";
+ TearcherInfo tearcherInfo = tearcherService.selectByUid(uid);
+ if (tearcherInfo != null) {
+ tearcherName = tearcherInfo.getNickName();
+ }
+ data.put("tearcherName", tearcherName);
+
+ // 閭�璇蜂汉
+ String bossName = "";
+ UserInfo boss = threeSaleSerivce.getBoss(uid);
+ if (boss != null) {
+ bossName = boss.getNickName();
+ }
+ data.put("bossName", bossName);
+
+ // 閭�璇风矇涓�
+ int doneFirst = 0;
+ int doneSecond = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+ }
+ data.put("doneFirst", doneFirst);
+ data.put("doneSecond", doneSecond);
+
+ // 涔濅唬绮変笣鏁伴噺
+ data.put("nineFans", threeSaleDetailService.countByBossUidAndMaxLevel(uid, 9));
+
+ // 鏈夋晥绮変笣
+ data.put("first", threeSaleSerivce.countFirstTeam(uid));
+ data.put("second", threeSaleSerivce.countSecondTeam(uid));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+
+
+ /**
+ * 鐢ㄦ埛璇︾粏淇℃伅
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @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());
+
+
+ String mark = "";
+ String activation = "鏈縺娲�";
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
+ mark = userInfoExtra.getMark();
+ }
+
+ String inviteCode = userInfoExtra.getInviteCode();
+ if (!StringUtil.isNullOrEmpty(inviteCode)) {
+ activation = "宸叉縺娲�";
+ } else {
+ activation = "鏈縺娲�";
+ }
+ }
+ data.put("mark", mark);
+ data.put("activation", activation);
+
+ // 鏈�杩戜竴娆′笅鍗曟椂闂�
+ String orderTime = "";
+ Date lastOrderTime = hongBaoV2CountService.getLastHongBaoTime(uid);
+ if (lastOrderTime != null) {
+ orderTime = TimeUtil.formatDate(lastOrderTime);
+ }
+ data.put("orderTime", orderTime);
+
+
+ // 鏈�杩戠櫥褰曟椂闂�
+ String activeTime = "";
+ UserActiveLog userActiveLog = userActiveLogService.getUserLatestActiveInfo(uid);
+ if (userActiveLog != null) {
+ activeTime = TimeUtil.formatDate(userActiveLog.getCreateTime());
+ }
+ 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));
+ }
+
/**
* 缁熻浠婃棩鐢ㄦ埛鎬绘儏鍐�
@@ -1479,31 +1635,7 @@
- /**
- * 鐢ㄦ埛绮変笣缁熻
- *
- * @param callback
- * @param pageIndex
- * @param pageSize
- * @param id
- * @param out
- */
- @RequestMapping(value = "countTeamFans")
- public void countTeamFans(String callback, Long uid, PrintWriter out) {
- int doneFirst = 0;
- int doneSecond = 0;
- UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
- if (userInviteValidNum != null) {
- doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
- doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
- }
- JSONObject data = new JSONObject();
- data.put("doneFirst", doneFirst);
- data.put("doneSecond", doneSecond);
- data.put("first", threeSaleSerivce.countFirstTeam(uid));
- data.put("second", threeSaleSerivce.countSecondTeam(uid));
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- }
+
}
--
Gitblit v1.8.0