From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 120 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
index 442453f..7212b8b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -1,5 +1,7 @@
package com.yeshi.fanli.service.impl.user;
+import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -9,24 +11,35 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.FileUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.tencentcloud.COSManager;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
+import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
+import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
+import com.yeshi.fanli.dto.mq.user.body.InviteCodeActiveMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.UserInfoUpdateMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.UserInfoUpdateMQMsg.UserInfoUpdateTypeEnum;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.bus.user.UserRankRecord;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.ThreeSaleException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
@@ -40,11 +53,16 @@
import com.yeshi.fanli.service.inter.user.UserRankService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.InviteCodeFilterUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
+
+import net.coobird.thumbnailator.Thumbnails;
@Service
public class UserInfoExtraServiceImpl implements UserInfoExtraService {
@@ -79,6 +97,9 @@
@Resource
private UserInviteRecordService userInviteRecordService;
+ @Resource(name = "producer")
+ private Producer producer;
+
@Override
public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
@@ -88,10 +109,10 @@
}
// 绛夌骇瀵圭収琛�
- String contrast = configService.get("user_rank_contrast");
+ String contrast = configService.get(ConfigKeyEnum.userRankContrast.getKey());
extraVO.setRankContrast(contrast);
// 鐗瑰埆鎻愰啋
- String rankTip = configService.get("user_rank_tip");
+ String rankTip = configService.get(ConfigKeyEnum.userRankTip.getKey());
extraVO.setRankTip(rankTip);
Integer rankOrderNum = extraVO.getRankOrderNum();
@@ -176,7 +197,7 @@
} else {
extra.setUserInfo(new UserInfo(uid));
}
-
+
// 鏇存柊绛夌骇
if (isupdateRank) {
List<UserRank> listRank = userRankService.getAllRank();
@@ -276,7 +297,6 @@
userInfoExtraMapper.insertSelective(userInfoExtra);
}
-
@Override
public UserInfoExtra saveUserInfoExtra(UserInfoExtra userInfoExtra) throws UserInfoExtraException {
@@ -313,9 +333,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException {
- if (uid == null || inviteCode == null)
+ if (uid == null || inviteCode == null)
throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉鑳戒负绌�");
-
+
// 琚個璇蜂汉淇℃伅
UserInfo invitee = userInfoService.selectByPKey(uid);
if (invitee == null)
@@ -331,7 +351,7 @@
UserInfo inviter = userInfoService.getUserInfoByInviteCode(inviteCode);
if (inviter == null)
throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
-
+
// 缁戝畾鍏崇郴
try {
threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
@@ -346,7 +366,7 @@
// 鐢熸垚閭�璇风爜
String mycode = createInviteCode(uid);
- if (StringUtil.isNullOrEmpty(mycode))
+ if (StringUtil.isNullOrEmpty(mycode))
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
UserInfoExtra userInfoExtra = new UserInfoExtra();
@@ -360,6 +380,13 @@
userInfoExtra.setCreateTime(new Date());
userInfoExtraMapper.insertSelective(userInfoExtra);
}
+
+ if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
+ new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
+ producer.send(message);
+ }
+
return mycode;
}
@@ -368,7 +395,7 @@
public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException {
if (uid == null || code == null)
throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
-
+
UserInfo invitee = userInfoService.selectByPKey(uid);
if (invitee == null)
throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
@@ -423,7 +450,7 @@
LogHelper.test("寰俊澶村儚涓嬭浇澶辫触: " + weiXinUser.getUnionid() + " " + headimgurl);
} else {
FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String.format(
- "/portrait/wx/%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));
+ FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));
if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
headimgurl = result.getUrl();
} else {
@@ -458,9 +485,9 @@
// 鐢熸垚閭�璇风爜
String inviteCode = createInviteCode(uid);
- if (StringUtil.isNullOrEmpty(inviteCode))
+ if (StringUtil.isNullOrEmpty(inviteCode))
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
-
+
UserInfoExtra userInfoExtra = new UserInfoExtra();
userInfoExtra.setUserInfo(invitee);
userInfoExtra.setInviteCode(inviteCode);
@@ -471,6 +498,12 @@
} else {
userInfoExtra.setCreateTime(new Date());
userInfoExtraMapper.insertSelective(userInfoExtra);
+ }
+
+ if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
+ new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
+ producer.send(message);
}
}
@@ -536,7 +569,7 @@
LogHelper.test("寰俊澶村儚涓嬭浇澶辫触: " + weiXinUser.getUnionid() + " " + headimgurl);
} else {
FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String.format(
- "/portrait/wx/%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));
+ FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));
if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
headimgurl = result.getUrl();
} else {
@@ -571,10 +604,11 @@
}
// 鐢熸垚閭�璇风爜
- String inviteCode = createInviteCode(uid);;
- if (StringUtil.isNullOrEmpty(inviteCode))
+ String inviteCode = createInviteCode(uid);
+ ;
+ if (StringUtil.isNullOrEmpty(inviteCode))
throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
-
+
UserInfoExtra userInfoExtra = new UserInfoExtra();
userInfoExtra.setUserInfo(invitee);
userInfoExtra.setInviteCode(inviteCode);
@@ -585,6 +619,12 @@
} else {
userInfoExtra.setCreateTime(new Date());
userInfoExtraMapper.insertSelective(userInfoExtra);
+ }
+
+ if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
+ new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
+ producer.send(message);
}
}
@@ -617,12 +657,12 @@
public void updateGoldCoin(Long id, Integer goldCoin) {
userInfoExtraMapper.updateGoldCoin(id, goldCoin);
}
-
+
@Override
public void addGoldCoinByUid(Long uid, Integer goldCoin) {
userInfoExtraMapper.addGoldCoinByUid(uid, goldCoin);
}
-
+
@Override
public void updateByPrimaryKeySelective(UserInfoExtra record) {
userInfoExtraMapper.updateByPrimaryKeySelective(record);
@@ -640,17 +680,17 @@
// vip閭�璇风爜浼樺厛
if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip()))
return userInfoExtra.getInviteCodeVip();
-
+
if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
return userInfoExtra.getInviteCode();
-
+
// 鏄惁婊¤冻鐢熶骇閭�璇风爜
int relationshipNum = threeSaleSerivce.getSuccessRelationshipNum(uid);
if (relationshipNum > 0) {
try {
String inviteCode = createInviteCode(uid);
if (!StringUtil.isNullOrEmpty(inviteCode)) {
- UserInfoExtra extra= new UserInfoExtra();
+ UserInfoExtra extra = new UserInfoExtra();
extra.setId(userInfoExtra.getId());
extra.setInviteCode(inviteCode);
userInfoExtraMapper.updateByPrimaryKeySelective(extra);
@@ -666,12 +706,13 @@
/**
* 鐢熶骇閭�璇风爜
+ *
* @param uid
* @return
*/
private String createInviteCode(Long uid) {
String inviteCode = null;
- for (int i = 1; i <= 5; i ++) {
+ for (int i = 1; i <= 5; i++) {
inviteCode = UserUtil.getInviteCode(i, uid);
long countCode = userInfoExtraMapper.countByInviteCode(inviteCode);
if (countCode <= 0)
@@ -679,8 +720,7 @@
}
return inviteCode;
}
-
-
+
@Override
public long countByRankId(Long rankId) {
return userInfoExtraMapper.countByRankId(rankId);
@@ -724,11 +764,11 @@
public UserInfo getUserByInviteCode(String inviteCode) throws UserInfoExtraException {
if (StringUtil.isNullOrEmpty(inviteCode))
throw new UserInfoExtraException(1, "閭�璇风爜涓嶈兘涓虹┖");
-
+
UserInfo inviter = userInfoService.getUserInfoByInviteCode(inviteCode);
if (inviter == null)
throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
-
+
return inviter;
}
@@ -782,40 +822,85 @@
userInfoExtraMapper.updateAutoExtract(days);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateInviteCodeVip(String inviteCodeVip, Long uid) throws UserInfoExtraException {
if (inviteCodeVip == null || inviteCodeVip.length() < 4 || inviteCodeVip.length() > 12)
throw new UserInfoExtraException(1, "閭�璇风爜蹇呴』涓�4鍒�12浣�");
-
+
UserInfoExtra extra = getUserInfoExtra(uid);
if (extra == null)
throw new UserInfoExtraException(2, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
if (StringUtil.isNullOrEmpty(extra.getInviteCode()))
throw new UserInfoExtraException(3, "閭�璇风爜灏氭湭婵�娲�");
-
+
if (!StringUtil.isNullOrEmpty(extra.getInviteCodeVip()))
throw new UserInfoExtraException(4, "鍙兘淇敼涓�娆�");
-
+
// 杞崲鎴愬ぇ鍐�
inviteCodeVip = inviteCodeVip.toUpperCase();
-
+
// 楠岃瘉鐗规畩鐮�
- if(InviteCodeFilterUtil.isSpecialCode(inviteCodeVip))
+ if (InviteCodeFilterUtil.isSpecialCode(inviteCodeVip))
throw new UserInfoExtraException(5, "閭�璇风爜宸插瓨鍦�");
-
+
if (inviteCodeVip.equalsIgnoreCase(extra.getInviteCode()))
throw new UserInfoExtraException(5, "涓嶈兘涓哄師閭�璇风爜");
-
+
long count = userInfoExtraMapper.countByInviteCode(inviteCodeVip);
if (count > 0)
throw new UserInfoExtraException(6, "閭�璇风爜宸插瓨鍦�");
-
+
UserInfoExtra update = new UserInfoExtra();
update.setId(extra.getId());
update.setInviteCodeVip(inviteCodeVip);
update.setUpdateTime(new Date());
userInfoExtraMapper.updateByPrimaryKeySelective(update);
+
+ if(!Constant.IS_TEST) { //鍙戦�侀個璇风爜鏇存敼鎴愬姛鐨勬秷鎭�
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userInfoUpdate,
+ new Gson().toJson(new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip, new Date())));
+ producer.send(message);
+ }
+ }
+
+
+ @Override
+ public void uploadERCode(MultipartFile file, Long uid) {
+ UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (extra == null)
+ return;
+
+ // 鍘嬬缉
+ String targetPath = FileUtil.getCacheDir() + "/erCode_" + uid + "_" + System.currentTimeMillis()+ ".jpg";
+ try {
+ Thumbnails.of(file.getInputStream()).size(200, 200).toFile(targetPath);
+ } catch (IOException e) {
+ LogHelper.errorDetailInfo(e);
+ return;
+ }
+
+ // 鎵ц涓婁紶
+ String filePath = FilePathEnum.userERcode.getPath() + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+ String fileLink = COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();
+
+ // 鍒犻櫎鏈湴鍥剧墖
+ if (new File(targetPath).exists()) {
+ new File(targetPath).delete();
+ }
+
+ // 鍘熶簩缁寸爜
+ String erCode = extra.getErCode();
+
+ UserInfoExtra update = new UserInfoExtra();
+ update.setId(extra.getId());
+ update.setErCode(fileLink);
+ userInfoExtraMapper.updateByPrimaryKeySelective(update);
+
+ // 鍘熶簩缁寸爜
+ if (!StringUtil.isNullOrEmpty(erCode)) {
+ COSManager.getInstance().deleteFile(erCode);
+ }
}
}
--
Gitblit v1.8.0