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/UserInfoExtraServiceImpl.java |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 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 f25109d..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
@@ -39,6 +39,7 @@
 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;
@@ -52,6 +53,7 @@
 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;
@@ -107,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();
@@ -379,10 +381,11 @@
 			userInfoExtraMapper.insertSelective(userInfoExtra);
 		}
 
-		// 鍙戦�佹縺娲绘垚鍔熸秷鎭�
-		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
-				new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
-		producer.send(message);
+		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;
 	}
@@ -447,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 {
@@ -496,10 +499,12 @@
 			userInfoExtra.setCreateTime(new Date());
 			userInfoExtraMapper.insertSelective(userInfoExtra);
 		}
-		// 鍙戦�佹縺娲绘垚鍔熸秷鎭�
-		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
-				new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
-		producer.send(message);
+		
+		if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
+			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
+					new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));
+			producer.send(message);
+		}
 	}
 
 	@Override
@@ -564,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 {
@@ -614,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);
 		}
 	}
 
@@ -846,10 +857,12 @@
 		update.setInviteCodeVip(inviteCodeVip);
 		update.setUpdateTime(new Date());
 		userInfoExtraMapper.updateByPrimaryKeySelective(update);
-	    //鍙戦�侀個璇风爜鏇存敼鎴愬姛鐨勬秷鎭�
-		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userInfoUpdate,
-				new Gson().toJson(new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip, new Date())));
-		producer.send(message);
+	   
+		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);
+		}
 	}
 	
 	
@@ -869,7 +882,7 @@
 		}
 		
 		// 鎵ц涓婁紶
-		String filePath = "/img/user/erCode/" + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+		String filePath = FilePathEnum.userERcode.getPath() + UUID.randomUUID().toString().replace("-", "") + ".jpg";
 		String fileLink = COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();
 	
 		// 鍒犻櫎鏈湴鍥剧墖

--
Gitblit v1.8.0