From d126b83f5d65f612ec93475b976fc5b5e2d6132a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 五月 2019 17:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 68a51b5..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
@@ -576,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();
}
@@ -645,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