From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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..a3fe32d 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,11 +28,11 @@
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;
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;
@@ -44,7 +44,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 +51,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;
@@ -98,7 +98,6 @@
@Resource
private IntegralGetService integralGetService;
-
@Override
public int insert(UserShareGoodsRecord record) {
@@ -132,7 +131,7 @@
@Override
public List<UserShareGoodsGroup> listByRecordId(Long shareId) {
- return userShareGoodsGroupService.listByRecordId(shareId);
+ return userShareGoodsGroupService.listByRecordId(shareId, true);
}
@Override
@@ -333,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 {
// 鍒嗕韩璁板綍
@@ -376,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 {
@@ -490,7 +489,8 @@
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;
}
@@ -500,7 +500,7 @@
JSONArray array = new JSONArray();
- List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);
+ List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId, true);
List<Long> listGid = new ArrayList<Long>();
for (UserShareGoodsGroup goodsGroup : list) {
@@ -526,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();
@@ -583,7 +584,7 @@
JSONArray array = new JSONArray();
- List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);
+ List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId, true);
if (list != null && list.size() > 0) {
@@ -611,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();
@@ -679,7 +681,8 @@
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 +725,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 +766,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 +810,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 +851,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 +865,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 +924,7 @@
}
// 娓呯悊缂撳瓨
- redisManager.removeCommonString(shareKey);
+ redisManager.removeCommonString(redisKey);
if (singleGoods) {
if (taolijin) {
@@ -1025,11 +1029,12 @@
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;
}
-
+
@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