From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 0e97494..7c96e19 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -34,9 +34,11 @@
import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
+import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
@@ -79,7 +81,10 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
+ @Lazy
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -89,10 +94,16 @@
@Resource
private SpreadUserImgService spreadUserImgService;
-
+
+ @Lazy
+ @Resource
+ private IntegralDetailService integralDetailService;
+
@Lazy
@Resource
private UserInfoModifyRecordService userInfoModifyRecordService;
+
+
public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {
List<UserInfo> list = null;
@@ -256,6 +267,61 @@
return UserUtil.filterForClientUser(user);
}
+
+
+ @Override
+ public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days,
+ String startTime, String endTime,Integer userType, String level, Integer activeCode) {
+ return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);
+ }
+
+ @Override
+ public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType,
+ String userRank, Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode) {
+
+ List<UserInfoVO> userList = userInfoMapper.queryInfo(start, count, userState, key, keyType, userRank, days,
+ startTime, endTime, userType, level, activeCode);
+
+ if (userList == null || userList.size() == 0) {
+ return null;
+ }
+
+ for (UserInfoVO userInfoVO : userList) {
+ Long uid = userInfoVO.getId();
+ String rankName = userInfoVO.getRankName();
+ if (rankName == null || rankName.trim().length() == 0) {
+ userInfoVO.setRankName("闈掗摐");
+ userInfoVO.setRankPicture("http://img.flqapp.com/resource/rank/rank_picture_new_1.png");
+ }
+
+ String userLevel = userInfoVO.getUserLevel();
+ if (!StringUtil.isNullOrEmpty(userLevel)) {
+ userInfoVO.setUserLevel(UserLevelUtil.getByEnumName(userLevel).getName());
+ }
+ // 绱鎻愮幇
+ userInfoVO.setTotalExtract(payInfoMapper.sumMoneyByUid(uid));
+
+ // 绱璁㈠崟鏁伴噺
+ userInfoVO.setTotalOrder(commonOrderCountService.countHistoryOrderNum(uid));
+
+ // 绱鍏戞崲閲戝竵
+ userInfoVO.setTotalGoldCoinUsed(integralDetailService.sumUseGoldCoin(uid));
+
+ // 閭�璇蜂汉
+ UserInfo boss = threeSaleSerivce.getBoss(uid);
+ if (boss == null) {
+ userInfoVO.setBossName("");
+ } else {
+ userInfoVO.setBossName("涓婄骇锛�" + boss.getNickName());
+ }
+ }
+
+ return userList;
+ }
+
+
+
+
@Override
public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
String startTime, String endTime,Integer userType, String level, Integer activeCode) {
@@ -391,12 +457,12 @@
userInfoVO.setCountScanHistory(countScanHistory);
// 涓�搴﹂槦鍛樻暟閲�
- int firstTeamCount = shareMapper.myFirstTeamCount(uid + "");
- userInfoVO.setCountLevelOne(firstTeamCount);
+ //int firstTeamCount = shareMapper.myFirstTeamCount(uid + "");
+ //userInfoVO.setCountLevelOne(firstTeamCount);
// 浜屽害闃熷憳鏁伴噺
- int secondTeamCount = shareMapper.mySecondTeamCount(uid + "");
- userInfoVO.setCountLevelTwo(secondTeamCount);
+ //int secondTeamCount = shareMapper.mySecondTeamCount(uid + "");
+ //userInfoVO.setCountLevelTwo(secondTeamCount);
String userLevel = userInfoVO.getUserLevel();
if (!StringUtil.isNullOrEmpty(userLevel)) {
--
Gitblit v1.8.0