From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 65 +++++++++-----------------------
1 files changed, 19 insertions(+), 46 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..0e97494 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,14 +27,10 @@
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;
@@ -49,7 +45,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;
@@ -204,43 +200,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) {
@@ -298,16 +258,17 @@
@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;
@@ -436,6 +397,18 @@
// 浜屽害闃熷憳鏁伴噺
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