From dc675e0c19849b1d1a77c64f0b5c6a25eb91ace2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 七月 2019 10:50:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 157 +++++++++++++++++++++++++++++++++------------------
1 files changed, 101 insertions(+), 56 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 c8bccea..d6d65ea 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
@@ -24,6 +24,7 @@
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
@@ -31,6 +32,7 @@
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
@@ -197,6 +199,28 @@
}
}
}
+
+ String shareType = shareRecord.getShareType();
+ if (StringUtil.isNullOrEmpty(shareType)) {
+ shareRecord.setShareType(UserShareGoodsRecord.SHARETYPE_SINGLE);
+ }
+
+ BigDecimal totalMoney = shareRecord.getTotalMoney();
+ if (totalMoney == null) {
+ shareRecord.setTotalMoney(new BigDecimal(0));
+ }
+ }
+ } else {
+ for (UserShareGoodsRecord shareRecord : list) {
+ String shareType = shareRecord.getShareType();
+ if (StringUtil.isNullOrEmpty(shareType)) {
+ shareRecord.setShareType(UserShareGoodsRecord.SHARETYPE_SINGLE);
+ }
+
+ BigDecimal totalMoney = shareRecord.getTotalMoney();
+ if (totalMoney == null) {
+ shareRecord.setTotalMoney(new BigDecimal(0));
+ }
}
}
}
@@ -205,8 +229,9 @@
}
@Override
- public void saveSingleShareRecord(Long uid, Long auctionId) throws UserShareGoodsRecordException {
- if (auctionId == null) {
+ public void saveSingleShareRecord(Long uid, Long goodsId, Integer goodsType)
+ throws UserShareGoodsRecordException {
+ if (goodsId == null) {
throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖");
}
@@ -214,11 +239,31 @@
throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
}
- TaoBaoGoodsBrief goodsBrief = null;
- try {
- goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
- } catch (TaobaoGoodsDownException e) {
- throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
+ CommonGoods convertGoods = null;
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
+ JDGoods jdGoods = redisManager.getJDGoods(goodsId);
+ if (jdGoods == null) {
+ throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+ }
+ convertGoods = CommonGoodsFactory.create(jdGoods);
+ } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+ PDDGoodsDetail pddGoods = redisManager.getPDDGoodsDetail(goodsId);
+ if (pddGoods == null) {
+ throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+ }
+ convertGoods = CommonGoodsFactory.create(pddGoods);
+ } else {
+ TaoBaoGoodsBrief goodsBrief = null;
+ try {
+ goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
+ } catch (TaobaoGoodsDownException e) {
+ throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+ }
+ convertGoods = CommonGoodsFactory.create(goodsBrief);
}
UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
@@ -226,50 +271,46 @@
userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail);
userShareGoodsRecord.setShareState(1);
+ convertGoods.setState(0);
+ CommonGoods resultCommonGoods = null;
try {
- CommonGoods convertGoods = CommonGoodsFactory.create(goodsBrief);
- convertGoods.setState(goodsBrief.getState());
- CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(convertGoods);
-
- if (resultCommonGoods == null) {
- return;
- }
-
- UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),
- userShareGoodsRecord.getUid());
-
- if (singleGoods != null) {
- // 鍗曚釜鍟嗗搧澶氭鍒嗕韩
- userShareGoodsRecord.setPicture(goodsBrief.getPictUrl());
- userShareGoodsRecord.setId(singleGoods.getRecordId());
- userShareGoodsRecord.setUpdateTime(new Date());
- userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
-
- // 鏈�鏂板晢鍝�
- singleGoods.setUpdateTime(new Date());
- userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
-
- } else {
- // 鍗曚釜鍟嗗搧绗竴娆″垎浜�
- Date date = new Date();
- userShareGoodsRecord.setPicture(goodsBrief.getPictUrl());
- userShareGoodsRecord.setCreateTime(date);
- userShareGoodsRecord.setUpdateTime(date);
- userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
-
- singleGoods = new UserShareGoodsGroup();
- singleGoods.setTotalOrder(0);
- singleGoods.setTotalBrowse(0);
- singleGoods.setTodayBrowse(0);
- singleGoods.setTotalMoney(new BigDecimal(0));
- singleGoods.setCreateTime(date);
- singleGoods.setUpdateTime(date);
- singleGoods.setCommonGoods(resultCommonGoods);
- singleGoods.setRecordId(userShareGoodsRecord.getId());
- userShareGoodsGroupService.insertSelective(singleGoods);
- }
+ resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(convertGoods);
} catch (CommonGoodsException e) {
- e.printStackTrace();
+ throw new UserShareGoodsRecordException(1, "鍟嗗搧瀛樺叆澶辫触");
+ }
+
+ UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),
+ userShareGoodsRecord.getUid());
+
+ if (singleGoods != null) {
+ // 鍗曚釜鍟嗗搧澶氭鍒嗕韩
+ userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
+ userShareGoodsRecord.setId(singleGoods.getRecordId());
+ userShareGoodsRecord.setUpdateTime(new Date());
+ userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
+
+ // 鏈�鏂板晢鍝�
+ singleGoods.setUpdateTime(new Date());
+ userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
+
+ } else {
+ // 鍗曚釜鍟嗗搧绗竴娆″垎浜�
+ Date date = new Date();
+ userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
+ userShareGoodsRecord.setCreateTime(date);
+ userShareGoodsRecord.setUpdateTime(date);
+ userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
+
+ singleGoods = new UserShareGoodsGroup();
+ singleGoods.setTotalOrder(0);
+ singleGoods.setTotalBrowse(0);
+ singleGoods.setTodayBrowse(0);
+ singleGoods.setTotalMoney(new BigDecimal(0));
+ singleGoods.setCreateTime(date);
+ singleGoods.setUpdateTime(date);
+ singleGoods.setCommonGoods(resultCommonGoods);
+ singleGoods.setRecordId(userShareGoodsRecord.getId());
+ userShareGoodsGroupService.insertSelective(singleGoods);
}
}
@@ -610,7 +651,7 @@
}
@Override
- public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId) throws UserShareGoodsRecordException {
+ public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException {
if (auctionId == null || uid == null || uid <= 0) {
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
@@ -618,10 +659,11 @@
ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
recordDTO.setUid(uid);
recordDTO.setAuctionId(auctionId);
+ recordDTO.setGoodsType(goodsType);
recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);
// 鍒嗕韩id
- String key = StringUtil.Md5(uid + "#" + auctionId);
+ String key = StringUtil.Md5(uid + "#GoodsDetail#" + auctionId + "#Type#"+ goodsType);
redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
recordDTO.setRedisKey(key);
@@ -659,7 +701,7 @@
recordDTO.setSource(ShareSourceTypeEnum.storage);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = StringUtil.Md5(uid + "##" + id);
+ String key = StringUtil.Md5(uid + "#GoodsStorage#" + id);
recordDTO.setRedisKey(key);
redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
@@ -698,7 +740,7 @@
recordDTO.setSharePictureUrl(uploadResult.getUrl());
recordDTO.setSource(ShareSourceTypeEnum.activity);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = StringUtil.Md5(uid + "##" + id);
+ String key = StringUtil.Md5(uid + "#Activity#" + id);
recordDTO.setRedisKey(key);
redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
@@ -734,7 +776,7 @@
recordDTO.setSource(ShareSourceTypeEnum.activity);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
- String key = StringUtil.Md5(uid + "##" + id);
+ String key = StringUtil.Md5(uid + "#Dynamic#" + id);
recordDTO.setRedisKey(key);
redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
@@ -761,7 +803,7 @@
ShareSourceTypeEnum source = recordDTO.getSource();
if (ShareSourceTypeEnum.goodsDetail.equals(source)) {
// 鍟嗗搧璇︽儏鍒嗕韩
- saveSingleShareRecord(recordDTO.getUid(), recordDTO.getAuctionId());
+ saveSingleShareRecord(recordDTO.getUid(), recordDTO.getAuctionId(),recordDTO.getGoodsType());
} else if (ShareSourceTypeEnum.activity.equals(source)) {
// 鍔ㄦ�佸垎浜�
UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();
@@ -795,6 +837,9 @@
}
}
}
+
+ // 娓呯悊缂撳瓨
+ redisManager.removeCommonString(shareKey);
}
/**
@@ -864,7 +909,7 @@
}
}
- InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods);
+ InputStream inputStream = ImageUtil.drawGoodsSharePicture(erCodeInputStream, portrait, listGoods);
FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
"sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
--
Gitblit v1.8.0