From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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..e9f3917 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;
@@ -575,13 +576,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();
}
@@ -644,7 +646,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();
}
--
Gitblit v1.8.0