From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 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..3ae4a94 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
@@ -120,6 +120,11 @@
public long countQueryByUid(Long uid, String source) {
return userShareGoodsRecordMapper.countQueryByUid(uid, source);
}
+
+ @Override
+ public List<UserShareGoodsGroup> listByRecordId(Long shareId) {
+ return userShareGoodsGroupService.listByRecordId(shareId);
+ }
@Override
public List<UserShareGoodsRecord> listCountRecord(List<Long> list) {
@@ -708,6 +713,45 @@
return recordDTO;
}
+
+ @Override
+ public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID)
+ throws UserShareGoodsRecordException {
+ if (uid == null || uid <= 0 || listGoodsBrief == null || listGoodsBrief.size() == 0) {
+ throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
+ }
+ // 鎻掑叆璁板綍
+ UserShareGoodsRecord record = new UserShareGoodsRecord();
+ record.setUid(uid);
+ record.setShareState(0); // 鍒濆鏈垎浜�
+ record.setSource(ShareSourceTypeEnum.storage);
+ record.setPicture(listGoodsBrief.get(0).getPictUrl()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+ record.setCreateTime(new Date());
+ userShareGoodsRecordMapper.insertSelective(record);
+
+ Long id = record.getId();
+ // 鍒嗕韩閾炬帴
+ String shareUrl = getShareUrlV2(record);
+ // 鍒嗕韩浜岀淮鐮侀摼鎺�
+ FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoodsBrief);
+
+ ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+ recordDTO.setUid(uid);
+ recordDTO.setShareId(id);
+ recordDTO.setShareUrl(shareUrl);
+ recordDTO.setListId(listStorageID);
+ recordDTO.setListGoodsBrief(listGoodsBrief);
+ 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 addRecordActivity(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
@@ -862,6 +906,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;
+ }
/**
* 鐢熸垚鍒嗕韩鍥�
--
Gitblit v1.8.0