From 205f8ba403095b4894d026f800d2651223c19d00 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 17:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
index 5621bc4..8994412 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -119,7 +119,7 @@
}
@Override
- public ActivityShareResult shareActivityGoods(Long uid, Long activityId) throws ActivityException {
+ public ActivityShareResult shareActivityGoods(Long uid, Long activityId) throws ActivityException,UserShareGoodsRecordException {
RecommendActivity activity = recommendActivityMapper.selectByPrimaryKey(activityId);
@@ -166,26 +166,20 @@
});
}
- if (listGoodsBrief.size() > 0) {
- try {
- FileUploadResult loadResult = userShareGoodsRecordService.save(uid,
- ShareSourceTypeEnum.activity, title, listGoodsBrief);
- imgList.add(loadResult);
-
- } catch (UserShareGoodsRecordException e) {
- throw new ActivityException(1, e.getMsg());
- }
- } else {
+ if (listGoodsBrief.size() < 1) {
throw new ActivityException(1, "鍟嗗搧涓嬫灦");
}
+ JSONObject resultdata = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title, listGoodsBrief);
+ imgList.add((FileUploadResult) resultdata.get("loadResult"));
result.setImgList(imgList);
+
return result;
}
@Override
- public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException {
+ public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException,UserShareGoodsRecordException {
RecommendActivity activity = recommendActivityMapper.selectByPrimaryKey(activityId);
@@ -203,7 +197,6 @@
result.setTitle(title);
- List<FileUploadResult> imgList = new ArrayList<>();
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
if (activity.getGoodsList() != null) {
@@ -232,17 +225,7 @@
});
}
- FileUploadResult loadResult = null;
- if (listGoodsBrief.size() > 0) {
- try {
- loadResult = userShareGoodsRecordService.save(uid,
- ShareSourceTypeEnum.activity, title, listGoodsBrief);
- imgList.add(loadResult);
-
- } catch (UserShareGoodsRecordException e) {
- throw new ActivityException(1, e.getMsg());
- }
- } else {
+ if (listGoodsBrief.size() < 1) {
throw new ActivityException(1, "鍟嗗搧涓嬫灦");
}
@@ -253,8 +236,13 @@
}
JSONObject data = new JSONObject();
- data.put("shareImg", loadResult);
+
+ JSONObject resultdata = userShareGoodsRecordService.save(uid,
+ ShareSourceTypeEnum.activity, title, listGoodsBrief);
+
data.put("revenue", revenue);
+ data.put("shareId", resultdata.get("shareId"));
+ data.put("shareImg", resultdata.get("loadResult"));
data.put("notifyDesc", configService.get("goods_share_notify"));
return data;
--
Gitblit v1.8.0