From d0bfdeda7f4f3b9f1685664d42c7592b533d8957 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 22 五月 2019 17:04:32 +0800
Subject: [PATCH] 新版、老版动态分享 + 选品库分享+商品详情分享 优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 e9f7bac..68a51b5 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
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
@@ -23,13 +22,13 @@
import com.yeshi.fanli.dao.mybatis.activity.RecommendActivityInviteInfoMapper;
import com.yeshi.fanli.dao.mybatis.activity.RecommendActivityMapper;
import com.yeshi.fanli.dao.mybatis.activity.RecommendActivityTaoBaoGoodsMapper;
+import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityImg;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
-import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.ActivityException;
@@ -186,9 +185,11 @@
throw new ActivityException(1, "鍟嗗搧涓嬫灦");
}
- Map<String, Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title,
- listGoodsBrief);
- imgList.add((FileUploadResult) map.get("loadResult"));
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordActivity(uid, listGoodsBrief);
+ FileUploadResult loadResult = new FileUploadResult();
+ loadResult.setUrl(shareRecord.getSharePictureUrl());
+
+ imgList.add(loadResult);
result.setImgList(imgList);
return result;
@@ -270,20 +271,20 @@
JSONObject contentJson2 = new JSONObject();
contentJson2.put("color", fontColor2);
contentJson2.put("content", revenue);
-
+
array.add(contentJson1);
array.add(contentJson2);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordActivity(uid, listGoodsBrief);
+ FileUploadResult loadResult = new FileUploadResult();
+ loadResult.setUrl(shareRecord.getSharePictureUrl());
+
JSONObject data = new JSONObject();
-
- Map<String, Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title,
- listGoodsBrief);
-
data.put("title", title);
data.put("revenue", array);
data.put("fanMoney", shareMoney);
- data.put("shareId", map.get("shareId"));
- data.put("shareImg", map.get("loadResult"));
+ data.put("shareId", shareRecord.getRedisKey());
+ data.put("shareImg", loadResult);
data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
return data;
--
Gitblit v1.8.0