From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 43 +++++++++++--------------------------------
1 files changed, 11 insertions(+), 32 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 2ff91bc..2ef543d 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
@@ -36,19 +36,15 @@
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.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
-import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
-import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
-import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserRankService;
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;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.account.UserUtil;
@@ -62,12 +58,6 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
- @Resource
- private UserInfoService userInfoService;
-
- @Resource
- private ConfigService configService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -93,11 +83,6 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
- @Resource
- private UserRankService userRankService;
-
- @Resource
- private UserActiveLogService userActiveLogService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -107,12 +92,6 @@
@Resource
private SpreadUserImgService spreadUserImgService;
-
- @Resource
- private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
-
- @Resource
- private BindingAccountService bindingAccountService;
@Lazy
@Resource
@@ -169,7 +148,7 @@
UserInfo temp = userInfoMapper.selectByPrimaryKey(form.getId());
COSManager cosManager = COSManager.getInstance();
InputStream inputStream = HttpUtil.getAsInputStream(temp.getPortrait());
- String uploadFile = cosManager.uploadFile(inputStream, UUID.randomUUID().toString()).getUrl();
+ String uploadFile = cosManager.uploadFile(inputStream, FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString()).getUrl();
UserInfo updateTemp = new UserInfo(temp.getId());
updateTemp.setPortrait(uploadFile);
userInfoMapper.updateByPrimaryKeySelective(updateTemp);
@@ -239,7 +218,7 @@
find.setWxUnionId(weiXinUser.getUnionid());
String wxHeadImg = COSManager.getInstance()
.uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
- Constant.WXHEADURL + UUID.randomUUID().toString())
+ FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())
.getUrl();
find.setPortrait(wxHeadImg);
find.setWxPic(wxHeadImg);
@@ -318,16 +297,16 @@
@Override
public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
- String startTime, String endTime) {
- return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime);
+ String startTime, String endTime,Integer userType) {
+ return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime,userType);
}
@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) {
+ String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,Integer userType) {
List<UserInfoVO> userList = userInfoMapper.query(start, count, userState, key, keyType, userRank, days,
- startTime, endTime, orderField, orderMode);
+ startTime, endTime, orderField, orderMode,userType);
if (userList == null || userList.size() == 0) {
return null;
@@ -515,8 +494,8 @@
* @return
*/
@Override
- public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {
- return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);
+ public UserInfo getUserInfoByInviteCode(String inviteCode) {
+ return userInfoMapper.getUserInfoByInviteCode(inviteCode);
}
@Override
@@ -600,7 +579,7 @@
Thumbnails.of(file.getInputStream()).size(200, 200).toFile(targetPath);
// 鎵ц涓婁紶
- String filePath = "/img/user/" + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+ String filePath =FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString().replace("-", "") + ".jpg";
String fileLink = COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();
// 鍒犻櫎鏈湴鍥剧墖
@@ -616,7 +595,7 @@
userInfoMapper.updateByPrimaryKeySelective(userInfo);
// 鍒犻櫎鍘熷ご鍍�
- if (!StringUtil.isNullOrEmpty(portrait) && portrait.contains("/img/user/")) {
+ if (!StringUtil.isNullOrEmpty(portrait)) {
COSManager.getInstance().deleteFile(portrait);
}
--
Gitblit v1.8.0