From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 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..494f6d1 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,14 +22,15 @@
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.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -186,9 +186,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,21 +272,21 @@
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("notifyDesc", configService.get("goods_share_multiple_notify"));
+ data.put("shareId", shareRecord.getRedisKey());
+ data.put("shareImg", loadResult);
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));
return data;
@@ -319,7 +321,7 @@
return activityUserMapper.selectList();
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, List<Long> goodsList,
RecommendActivity activity) throws ActivityException , Exception{
@@ -396,7 +398,7 @@
return activity;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public RecommendActivity addInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,
int px, int py, int erCodeSize) throws ActivityException, Exception {
@@ -445,7 +447,7 @@
return activity;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public RecommendActivity addTextAndImgRecommendActivity(Long activityUid, List<String> imgList,
RecommendActivity activity) throws ActivityException, Exception {
@@ -508,7 +510,7 @@
return recommendActivityMapper.selectByPrimaryKey(id);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public RecommendActivity updateShareGoodsRecommendActivity(Long activityUid,
List<Long> goodsList, RecommendActivity activity) throws ActivityException , Exception{
@@ -575,13 +577,14 @@
updateActivity.setTotalGetMoney("棰勪及鍒嗕韩濂栭噾锛毬�" + taotaoMoney.toString());
recommendActivityMapper.updateByPrimaryKeySelective(updateActivity);
+ // 1.5.4 鍔ㄦ�佷俊鎭洿鏂�
RecommendActivity exist = recommendActivityMapper.selectByPrimaryKey(activity.getId());
if (exist.getState() != null && exist.getState() == 1) {
try {
ActivityUser activityUser = activityUserService.selectByPrimaryKey(activityUid);
exist.setActivityUser(activityUser);
exist.setGoodsList(listgoods);
- dynamicInfoService.saveActivityRecommend(exist);
+ dynamicInfoService.insertActivityRecommend(exist);
} catch (Exception e) {
e.printStackTrace();
}
@@ -590,7 +593,7 @@
return activity;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public RecommendActivity updateInviteImgRecommendActivity(Long activityUid, RecommendActivity activity, String url,
int px, int py, int erCodeSize) throws ActivityException , Exception{
@@ -644,7 +647,12 @@
if (exist.getState() != null && exist.getState() == 1) {
try {
ActivityUser activityUser = activityUserService.selectByPrimaryKey(activityUid);
- dynamicInfoService.insertInviteMaterial(exist.getTitle(), url, activity.getId(), activityUser);
+ activity.setActivityUser(activityUser);
+ activity.setInviteInfo(recommendActivityInviteInfo);
+ List<String> imageList = new ArrayList<String>();
+ imageList.add(url);
+ activity.setImageList(imageList);
+ dynamicInfoService.insertInviteActivity(activity);
} catch (Exception e) {
e.printStackTrace();
}
@@ -652,7 +660,7 @@
return activity;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public RecommendActivity updateTextAndImgRecommendActivity(Long activityUid, List<String> imgList,
RecommendActivity activity) throws ActivityException , Exception{
@@ -748,7 +756,7 @@
return recommendActivityMapper.getRecommendActivityEffectiveCount();
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {
// 鑾峰彇鍟嗗搧
--
Gitblit v1.8.0