From cebb70396a159270ce84cb44caeafa82faa439a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 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 3ae4a94..5068d49 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
@@ -326,16 +326,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);
@@ -690,18 +688,24 @@
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);
@@ -715,9 +719,9 @@
}
@Override
- public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID)
+ public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<CommonGoods> listGoods, List<Long> listStorageID)
throws UserShareGoodsRecordException {
- if (uid == null || uid <= 0 || listGoodsBrief == null || listGoodsBrief.size() == 0) {
+ if (uid == null || uid <= 0 || listGoods == null || listGoods.size() == 0) {
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
// 鎻掑叆璁板綍
@@ -725,7 +729,7 @@
record.setUid(uid);
record.setShareState(0); // 鍒濆鏈垎浜�
record.setSource(ShareSourceTypeEnum.storage);
- record.setPicture(listGoodsBrief.get(0).getPictUrl()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+ record.setPicture(listGoods.get(0).getPicture()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
record.setCreateTime(new Date());
userShareGoodsRecordMapper.insertSelective(record);
@@ -733,14 +737,14 @@
// 鍒嗕韩閾炬帴
String shareUrl = getShareUrlV2(record);
// 鍒嗕韩浜岀淮鐮侀摼鎺�
- FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoodsBrief);
+ FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoods);
ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
recordDTO.setUid(uid);
recordDTO.setShareId(id);
recordDTO.setShareUrl(shareUrl);
recordDTO.setListId(listStorageID);
- recordDTO.setListGoodsBrief(listGoodsBrief);
+ recordDTO.setListGoods(listGoods);
recordDTO.setSharePictureUrl(uploadResult.getUrl());
recordDTO.setSource(ShareSourceTypeEnum.storage);
@@ -770,16 +774,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);
@@ -808,6 +817,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);
@@ -816,7 +830,7 @@
recordDTO.setUid(uid);
recordDTO.setShareId(id);
recordDTO.setShareUrl(shareUrl);
- recordDTO.setListGoodsBrief(listGoodsBrief);
+ recordDTO.setListGoods(listCommonGoods);
recordDTO.setSource(ShareSourceTypeEnum.activity);
// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
@@ -857,7 +871,7 @@
updateByPrimaryKeySelective(shareRecord);
// 淇濆瓨鍟嗗搧淇℃伅
- multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());
+ multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
} else if (ShareSourceTypeEnum.storage.equals(source)) {
// 鍒嗕韩搴撳垎浜�
@@ -868,7 +882,7 @@
updateByPrimaryKeySelective(shareRecord);
// 淇濆瓨鍟嗗搧淇℃伅
- multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());
+ multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
// 鏇存柊閫夊搧搴撳晢鍝佺姸鎬� 涓哄凡鍒嗕韩
List<Long> listId = recordDTO.getListId();
@@ -938,7 +952,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