From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 91 insertions(+), 52 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 e9ae937..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
@@ -27,20 +27,18 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.UserShareGoodsHistoryMapper;
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;
-import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
-import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.entity.system.BusinessSystem;
-import com.yeshi.fanli.exception.user.ThreeSaleException;
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;
@@ -49,7 +47,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.account.UserUtil;
-import com.yeshi.fanli.util.wx.WXLoginUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.user.UserInfoVO;
import net.coobird.thumbnailator.Thumbnails;
@@ -83,7 +81,10 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
+ @Lazy
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -93,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;
@@ -204,43 +211,7 @@
return userInfoMapper.countAvaiableUser();
}
- @Transactional
- public boolean inviteWXUserInfo(String code, UserInfo inviter) {
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinWYUser(code);
- if (weiXinUser == null) {
- return false;
- }
- String wxUnionId = weiXinUser.getUnionid();
- UserInfo find = getUserByLoginTypeAndOpenId(Constant.WEIXIN, wxUnionId, Constant.APPID);
-
- if (find == null) {
- find = new UserInfo();
- find.setAppId(Constant.APPID);
- find.setWxUnionId(weiXinUser.getUnionid());
- String wxHeadImg = COSManager.getInstance()
- .uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
- FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())
- .getUrl();
- find.setPortrait(wxHeadImg);
- find.setWxPic(wxHeadImg);
- find.setNickName(weiXinUser.getNickname());
- find.setWxName(weiXinUser.getNickname());
- find.setLoginType(Constant.WEIXIN);
- find.setRank(0);
- find.setWxOpenId(weiXinUser.getOpenid());
- BusinessSystem system = new BusinessSystem(Constant.FANLI);
- system.setPlatform(1);
- find.setSystem(system);
- }
-
- try {
- threeSaleSerivce.bind(find, inviter);
- return true;
- } catch (ThreeSaleException e) {
- e.printStackTrace();
- return false;
- }
- }
+
@Transactional
public void unBindUserInfo(UserInfo user, int type) {
@@ -296,18 +267,74 @@
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) {
- return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime,userType);
+ String startTime, String endTime,Integer userType, String level, Integer activeCode) {
+ return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);
}
@Override
public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,
- String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,Integer userType) {
+ String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,
+ Integer userType, String level, Integer activeCode) {
List<UserInfoVO> userList = userInfoMapper.query(start, count, userState, key, keyType, userRank, days,
- startTime, endTime, orderField, orderMode,userType);
+ startTime, endTime, orderField, orderMode,userType, level, activeCode);
if (userList == null || userList.size() == 0) {
return null;
@@ -430,12 +457,24 @@
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)) {
+ userInfoVO.setUserLevel(UserLevelUtil.getByEnumName(userLevel).getName());
+ }
+
+ String inviteCode = userInfoVO.getInviteCode();
+ if (!StringUtil.isNullOrEmpty(inviteCode)) {
+ userInfoVO.setInviteCode("宸叉縺娲�");
+ } else {
+ userInfoVO.setInviteCode("鏈縺娲�");
+ }
}
@Override
--
Gitblit v1.8.0