From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 62bb19d..36dc084 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
@@ -28,7 +28,6 @@
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
-import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
@@ -44,7 +43,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
-import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
@@ -52,13 +50,14 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.ImageUtil;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -490,7 +489,7 @@
InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods);
FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
- "sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
+ FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
return shareImg;
}
@@ -679,7 +678,7 @@
recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);
// 鍒嗕韩id
- String key = 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);
@@ -722,7 +721,7 @@
recordDTO.setSource(ShareSourceTypeEnum.storage);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = 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);
@@ -763,7 +762,7 @@
recordDTO.setSource(ShareSourceTypeEnum.storage);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = 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);
@@ -807,7 +806,7 @@
recordDTO.setSharePictureUrl(uploadResult.getUrl());
recordDTO.setSource(ShareSourceTypeEnum.activity);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = StringUtil.Md5(uid + "#Activity#" + id);
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#Activity#" + id));
recordDTO.setRedisKey(key);
redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
@@ -848,7 +847,7 @@
recordDTO.setSource(ShareSourceTypeEnum.activity);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = StringUtil.Md5(uid + "#Dynamic#" + id);
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#Dynamic#" + id));
recordDTO.setRedisKey(key);
redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
@@ -862,7 +861,8 @@
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
ShareGoodsRecordDTO recordDTO = null;
- String value = redisManager.getCommonString(shareKey);
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, shareKey);
+ String value = redisManager.getCommonString(redisKey);
if (!StringUtil.isNullOrEmpty(value)) {
recordDTO = JsonUtil.getSimpleGson().fromJson(value, ShareGoodsRecordDTO.class);
}
@@ -920,7 +920,7 @@
}
// 娓呯悊缂撳瓨
- redisManager.removeCommonString(shareKey);
+ redisManager.removeCommonString(redisKey);
if (singleGoods) {
if (taolijin) {
@@ -1025,7 +1025,7 @@
InputStream inputStream = ImageUtil.drawGoodsSharePicture(erCodeInputStream, portrait, listGoods);
FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
- "sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
+ FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
return shareImg;
}
--
Gitblit v1.8.0