From 61c21f17b1ad94e4b0018c7e385195bab21b0b5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 19:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 134 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 120 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 d6d65ea..bd5e44e 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
@@ -26,6 +26,7 @@
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.accept.AcceptData;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
@@ -42,6 +43,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
@@ -90,6 +92,11 @@
@Resource
private UserGoodsStorageService userGoodsStorageService;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+
@Override
public int insert(UserShareGoodsRecord record) {
@@ -119,6 +126,11 @@
@Override
public long countQueryByUid(Long uid, String source) {
return userShareGoodsRecordMapper.countQueryByUid(uid, source);
+ }
+
+ @Override
+ public List<UserShareGoodsGroup> listByRecordId(Long shareId) {
+ return userShareGoodsGroupService.listByRecordId(shareId);
}
@Override
@@ -321,16 +333,14 @@
* @param listGoods
*/
@Transactional
- public void multipleGoodsShareRecord(Long shareId, List<TaoBaoGoodsBrief> listGoods)
+ public void multipleGoodsShareRecord(Long shareId, List<CommonGoods> listGoods)
throws UserShareGoodsRecordException {
// 鍒嗕韩璁板綍
Date date = new Date();
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>();
- for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {
- CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief);
- commonGoods.setState(taoBaoGoodsBrief.getState());
+ for (CommonGoods commonGoods : listGoods) {
try {
CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);
@@ -651,7 +661,7 @@
}
@Override
- public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException {
+ public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin) throws UserShareGoodsRecordException {
if (auctionId == null || uid == null || uid <= 0) {
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
@@ -660,6 +670,7 @@
recordDTO.setUid(uid);
recordDTO.setAuctionId(auctionId);
recordDTO.setGoodsType(goodsType);
+ recordDTO.setTaolijin(isTaolijin);
recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);
// 鍒嗕韩id
@@ -685,18 +696,63 @@
record.setCreateTime(new Date());
userShareGoodsRecordMapper.insertSelective(record);
+ List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
+ for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {
+ listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));
+ }
+
+
Long id = record.getId();
// 鍒嗕韩閾炬帴
String shareUrl = getShareUrl(record);
// 鍒嗕韩浜岀淮鐮侀摼鎺�
- FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoodsBrief);
+ FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listCommonGoods);
ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
recordDTO.setUid(uid);
recordDTO.setShareId(id);
recordDTO.setShareUrl(shareUrl);
recordDTO.setListId(listStorageID);
- recordDTO.setListGoodsBrief(listGoodsBrief);
+ recordDTO.setListGoods(listCommonGoods);
+ recordDTO.setSharePictureUrl(uploadResult.getUrl());
+ recordDTO.setSource(ShareSourceTypeEnum.storage);
+
+ // 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
+ String key = StringUtil.Md5(uid + "#GoodsStorage#" + id);
+ recordDTO.setRedisKey(key);
+
+ redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
+
+ return recordDTO;
+ }
+
+ @Override
+ public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<CommonGoods> listGoods, List<Long> listStorageID)
+ throws UserShareGoodsRecordException {
+ if (uid == null || uid <= 0 || listGoods == null || listGoods.size() == 0) {
+ throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
+ }
+ // 鎻掑叆璁板綍
+ UserShareGoodsRecord record = new UserShareGoodsRecord();
+ record.setUid(uid);
+ record.setShareState(0); // 鍒濆鏈垎浜�
+ record.setSource(ShareSourceTypeEnum.storage);
+ record.setPicture(listGoods.get(0).getPicture()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+ record.setCreateTime(new Date());
+ userShareGoodsRecordMapper.insertSelective(record);
+
+ Long id = record.getId();
+ // 鍒嗕韩閾炬帴
+ String shareUrl = getShareUrlV2(record);
+ // 鍒嗕韩浜岀淮鐮侀摼鎺�
+ FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoods);
+
+ ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+ recordDTO.setUid(uid);
+ recordDTO.setShareId(id);
+ recordDTO.setShareUrl(shareUrl);
+ recordDTO.setListId(listStorageID);
+ recordDTO.setListGoods(listGoods);
recordDTO.setSharePictureUrl(uploadResult.getUrl());
recordDTO.setSource(ShareSourceTypeEnum.storage);
@@ -726,16 +782,21 @@
record.setCreateTime(new Date());
userShareGoodsRecordMapper.insertSelective(record);
+ List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
+ for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {
+ listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));
+ }
+
Long id = record.getId();
// 鍒嗕韩閾炬帴
String shareUrl = getShareUrl(record);
// 鍒嗕韩浜岀淮鐮侀摼鎺�
- FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoodsBrief);
+ FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listCommonGoods);
ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
recordDTO.setUid(uid);
recordDTO.setShareId(id);
- recordDTO.setListGoodsBrief(listGoodsBrief);
+ recordDTO.setListGoods(listCommonGoods);
recordDTO.setShareUrl(shareUrl);
recordDTO.setSharePictureUrl(uploadResult.getUrl());
recordDTO.setSource(ShareSourceTypeEnum.activity);
@@ -764,6 +825,11 @@
record.setCreateTime(new Date());
userShareGoodsRecordMapper.insertSelective(record);
+ List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
+ for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {
+ listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));
+ }
+
Long id = record.getId();
// 鍒嗕韩閾炬帴
String shareUrl = getShareUrl(record);
@@ -772,7 +838,7 @@
recordDTO.setUid(uid);
recordDTO.setShareId(id);
recordDTO.setShareUrl(shareUrl);
- recordDTO.setListGoodsBrief(listGoodsBrief);
+ recordDTO.setListGoods(listCommonGoods);
recordDTO.setSource(ShareSourceTypeEnum.activity);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
@@ -785,7 +851,7 @@
}
@Override
- public void takeEffectShareRecord(String shareKey) throws UserShareGoodsRecordException {
+ public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException {
if (StringUtil.isNullOrEmpty(shareKey)) {
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
@@ -799,6 +865,9 @@
throw new UserShareGoodsRecordException(1, "鍒嗕韩淇℃伅涓嶅瓨鍦�");
}
+ Long uid = recordDTO.getUid();
+ boolean taolijin = recordDTO.isTaolijin();
+ boolean singleGoods = true;
Long shareId = recordDTO.getShareId();
ShareSourceTypeEnum source = recordDTO.getSource();
if (ShareSourceTypeEnum.goodsDetail.equals(source)) {
@@ -812,11 +881,17 @@
shareRecord.setUpdateTime(new Date());
updateByPrimaryKeySelective(shareRecord);
+ List<CommonGoods> listGoods = recordDTO.getListGoods();
+ if (listGoods != null && listGoods.size() > 1)
+ singleGoods = false;
+
// 淇濆瓨鍟嗗搧淇℃伅
- multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());
+ multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
} else if (ShareSourceTypeEnum.storage.equals(source)) {
// 鍒嗕韩搴撳垎浜�
+ singleGoods = false;
+
UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();
shareRecord.setId(shareId);
shareRecord.setShareState(1);
@@ -824,7 +899,7 @@
updateByPrimaryKeySelective(shareRecord);
// 淇濆瓨鍟嗗搧淇℃伅
- multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());
+ multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
// 鏇存柊閫夊搧搴撳晢鍝佺姸鎬� 涓哄凡鍒嗕韩
List<Long> listId = recordDTO.getListId();
@@ -840,6 +915,16 @@
// 娓呯悊缂撳瓨
redisManager.removeCommonString(shareKey);
+
+ if (singleGoods) {
+ if (taolijin) {
+ integralGetService.addShareTLJGoods(uid);
+ } else {
+ integralGetService.addShareSingleGoods(uid);
+ }
+ } else {
+ integralGetService.addShareMultipleGoods(uid);
+ }
}
/**
@@ -862,6 +947,27 @@
}
return url;
}
+
+
+ /**
+ * 鍒嗕韩閾炬帴
+ *
+ * @param shareRecord
+ * @return
+ */
+ public String getShareUrlV2(UserShareGoodsRecord shareRecord) {
+ Long uid = shareRecord.getUid();
+ Long shareId = shareRecord.getId();
+
+ String url = String.format("http://%s/share_mushGoods_1.6.0.html?uid=%s&shareId=%s",
+ configService.getH5Host(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareId + "");
+
+ String shortLink = HttpUtil.getShortLink(url);
+ if (!StringUtil.isNullOrEmpty(shortLink)) {
+ url = shortLink;
+ }
+ return url;
+ }
/**
* 鐢熸垚鍒嗕韩鍥�
@@ -873,7 +979,7 @@
* @return
* @throws UserShareGoodsRecordException
*/
- public FileUploadResult drawingSharePicture(Long uid, Long shareId, String url, List<TaoBaoGoodsBrief> listGoods)
+ public FileUploadResult drawingSharePicture(Long uid, Long shareId, String url, List<CommonGoods> listGoods)
throws UserShareGoodsRecordException {
InputStream erCodeInputStream = null;
--
Gitblit v1.8.0