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/UserShareGoodsRecordServiceImpl.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
index 36dc084..4e138c4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -32,6 +32,7 @@
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
 import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -97,7 +98,6 @@
 
 	@Resource
 	private IntegralGetService integralGetService;
-	
 
 	@Override
 	public int insert(UserShareGoodsRecord record) {
@@ -332,7 +332,7 @@
 	 * @param userShareGoodsRecord
 	 * @param listGoods
 	 */
-	@Transactional(rollbackFor=Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	public void multipleGoodsShareRecord(Long shareId, List<CommonGoods> listGoods)
 			throws UserShareGoodsRecordException {
 		// 鍒嗕韩璁板綍
@@ -375,7 +375,7 @@
 	 * @param userShareGoodsRecord
 	 * @param listGoods
 	 */
-	@Transactional(rollbackFor=Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord,
 			List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {
 
@@ -489,7 +489,8 @@
 		InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods);
 
 		FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
-				FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
+				FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis()
+						+ ".png");
 
 		return shareImg;
 	}
@@ -525,7 +526,8 @@
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 
-		BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());
+		BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
+				java.lang.System.currentTimeMillis());
 
 		for (UserShareGoodsGroup goodsGroup : list) {
 			CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -610,7 +612,8 @@
 			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 
-			BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());
+			BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
+					java.lang.System.currentTimeMillis());
 
 			for (UserShareGoodsGroup goodsGroup : list) {
 				CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -678,7 +681,8 @@
 		recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);
 
 		// 鍒嗕韩id
-		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#GoodsDetail#" + auctionId + "#Type#" + goodsType));
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey,
+				StringUtil.Md5(uid + "#GoodsDetail#" + auctionId + "#Type#" + goodsType));
 		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
 		recordDTO.setRedisKey(key);
 
@@ -762,7 +766,7 @@
 		recordDTO.setSource(ShareSourceTypeEnum.storage);
 
 		// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
-		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey,StringUtil.Md5(uid + "#GoodsStorage#" + id));
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#GoodsStorage#" + id));
 		recordDTO.setRedisKey(key);
 
 		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
@@ -1025,11 +1029,12 @@
 
 		InputStream inputStream = ImageUtil.drawGoodsSharePicture(erCodeInputStream, portrait, listGoods);
 		FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
-				FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
+				FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis()
+						+ ".png");
 
 		return shareImg;
 	}
-	
+
 	@Override
 	public void saveShareRecord(Long uid, CommonGoods goods) throws UserShareGoodsRecordException {
 		if (goods == null || uid == null) {
@@ -1047,7 +1052,7 @@
 			throw new UserShareGoodsRecordException(1, "鍟嗗搧瀛樺叆澶辫触");
 		}
 
-		UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),uid);
+		UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(), uid);
 		if (singleGoods != null) {
 			// 鍗曚釜鍟嗗搧澶氭鍒嗕韩
 			userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
@@ -1078,7 +1083,5 @@
 			userShareGoodsGroupService.insertSelective(singleGoods);
 		}
 	}
-	
-	
-	
+
 }

--
Gitblit v1.8.0