From a06001d130f3b088a1afbd7d7dc8616d209a9fd5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 11:23:14 +0800
Subject: [PATCH] 更换头像时 清除用户的邀请图片
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 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 d714db8..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;
@@ -38,7 +37,9 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
+import com.yeshi.fanli.service.inter.activity.ActivityUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -108,6 +109,13 @@
@Resource
private CommonGoodsService commonGoodsService;
+
+ @Resource
+ private DynamicInfoService dynamicInfoService;
+
+ @Resource
+ private ActivityUserService activityUserService;
+
@Override
public List<RecommendActivity> getRecommendActivityList(int page, int pageSize) {
@@ -177,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;
@@ -261,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;
@@ -348,7 +358,7 @@
for (long auctionId : goodsList) {
TaoBaoGoodsBrief tb = null;
try {
- tb = TaoKeApiUtil.searchGoodsDetail(auctionId);
+ tb = redisManager.getTaoBaoGoodsBrief(auctionId);
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
@@ -483,6 +493,14 @@
recommendActivityMapper.batchDeleteByPrimaryKey(ids);
recommendActivityImgMapper.batchDeleteByActivityid(ids);
recommendActivityTaoBaoGoodsMapper.batchDeleteByActivityid(ids);
+
+ try {
+ for (Long id: ids) {
+ dynamicInfoService.deleteActivity(id);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@@ -523,12 +541,13 @@
activity.setType(RecommendActivity.TYPE_SHARE_GOODS);
recommendActivityMapper.updateByPrimaryKeySelective(activity);
+ List<RecommendActivityTaoBaoGoods> listgoods = new ArrayList<RecommendActivityTaoBaoGoods>();
BigDecimal taotaoMoney = new BigDecimal(0);
for (long auctionId : goodsList) {
TaoBaoGoodsBrief tb = null;
try {
- tb = TaoKeApiUtil.searchGoodsDetail(auctionId);
+ tb = redisManager.getTaoBaoGoodsBrief(auctionId);
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
@@ -548,13 +567,27 @@
recommendActivityTaoBaoGoodsMapper.insertSelective(goods);
BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
taotaoMoney = taotaoMoney.add(money);
+
+ listgoods.add(goods);
}
RecommendActivity updateActivity = new RecommendActivity();
updateActivity.setId(activity.getId());
updateActivity.setTotalGetMoney("棰勪及鍒嗕韩濂栭噾锛毬�" + taotaoMoney.toString());
recommendActivityMapper.updateByPrimaryKeySelective(updateActivity);
-
+
+ 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);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
return activity;
}
@@ -607,6 +640,16 @@
recommendActivityInviteInfo.setSize(erCodeSize);
recommendActivityInviteInfoMapper.insertSelective(recommendActivityInviteInfo);
+
+ RecommendActivity exist = recommendActivityMapper.selectByPrimaryKey(activity.getId());
+ if (exist.getState() != null && exist.getState() == 1) {
+ try {
+ ActivityUser activityUser = activityUserService.selectByPrimaryKey(activityUid);
+ dynamicInfoService.insertInviteMaterial(exist.getTitle(), url, activity.getId(), activityUser);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
return activity;
}
@@ -660,7 +703,18 @@
public List<RecommendActivity> getRecommendActivityListCache(int page, int pageSize) {
List<RecommendActivity> activityList = getRecommendActivityList(page, pageSize);
if (activityList != null) {
- for (RecommendActivity activity : activityList) {
+ for (int i = 0; i < activityList.size(); i++) {
+
+ RecommendActivity activity = activityList.get(i);
+
+ // 绛涢�夊嚭涓嶈冻9涓殑鍟嗗搧
+ if (RecommendActivity.TYPE_SHARE_GOODS == activity.getType()
+ && (activity.getGoodsList() == null || activity.getGoodsList().size() < 9)) {
+ activityList.remove(activity);
+ i--;
+ continue;
+ }
+
if (activity != null && activity.getGoodsList() != null) {
for (RecommendActivityTaoBaoGoods goods : activity.getGoodsList()) {
@@ -854,4 +908,14 @@
}
}
}
+
+ @Override
+ public List<String> getImgByActivityId(Long activityId){
+ return recommendActivityImgMapper.getImgByActivityId(activityId);
+ }
+
+ @Override
+ public List<RecommendActivity> getNeedPublish() {
+ return recommendActivityMapper.getNeedPublish();
+ }
}
--
Gitblit v1.8.0