From b3fce41f7960a21c707788aa87448c3e4de82da9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 11:47:51 +0800
Subject: [PATCH] 福利券 邀请队员成功之后激活
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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 5fca61e..43b8ea0 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
@@ -13,6 +13,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.taobao.TbImgUtil;
@@ -239,13 +240,18 @@
JSONObject contentJson1 = new JSONObject();
contentJson1.put("color", fontColor1);
contentJson1.put("content", "棰勪及鍒嗕韩濂栭噾:");
-
+ String shareMoney = "0";
String revenue = "楼0";
String totalGetMoney = activity.getTotalGetMoney();
if (totalGetMoney != null && totalGetMoney.trim().length() > 0) {
String[] split = totalGetMoney.split("锛�");
if (split != null) {
revenue = split[1];
+ }
+
+ String[] splitMoney = totalGetMoney.split("楼");
+ if (splitMoney != null) {
+ shareMoney = splitMoney[1];
}
}
@@ -263,6 +269,7 @@
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"));
@@ -300,6 +307,7 @@
return activityUserMapper.selectList();
}
+ @Transactional
@Override
public RecommendActivity addShareGoodsRecommendActivity(Long activityUid, String title, List<Long> goodsList,
boolean top, int shareCount) throws ActivityException {
@@ -363,9 +371,12 @@
return activity;
}
+ @Transactional
@Override
public RecommendActivity addInviteImgRecommendActivity(Long activityUid, String title, String url, boolean top,
int shareCount, int px, int py, int erCodeSize) throws ActivityException {
+ if (StringUtil.isNullOrEmpty(url))
+ throw new ActivityException(1, "鍥剧墖涓虹┖");
RecommendActivity activity = new RecommendActivity();
activity.setActivityUser(new ActivityUser(activityUid));
activity.setCreateTime(new Date());
@@ -395,11 +406,11 @@
recommendActivityInviteInfo.setRecommendActivity(activity);
recommendActivityInviteInfo.setSize(erCodeSize);
recommendActivityInviteInfoMapper.insertSelective(recommendActivityInviteInfo);
-
recommendActivityImgMapper.insertSelective(img);
return activity;
}
+ @Transactional
@Override
public RecommendActivity addTextAndImgRecommendActivity(Long activityUid, String title, List<String> imgList,
boolean top, int shareCount) throws ActivityException {
@@ -430,6 +441,7 @@
return activity;
}
+ @Transactional
@Override
public void deleteRecommendActivity(long[] ids) {
recommendActivityMapper.batchDeleteByPrimaryKey(ids);
@@ -443,6 +455,7 @@
return recommendActivityMapper.selectByPrimaryKey(id);
}
+ @Transactional
@Override
public RecommendActivity updateShareGoodsRecommendActivity(Long id, Long activityUid, String title,
List<Long> goodsList, boolean top, int shareCount) throws ActivityException {
@@ -497,6 +510,7 @@
return activity;
}
+ @Transactional
@Override
public RecommendActivity updateInviteImgRecommendActivity(Long id, Long activityUid, String title, String url,
boolean top, int shareCount, int px, int py, int erCodeSize) throws ActivityException {
@@ -539,6 +553,7 @@
return activity;
}
+ @Transactional
@Override
public RecommendActivity updateTextAndImgRecommendActivity(Long id, Long activityUid, String title,
List<String> imgList, boolean top, int shareCount) throws ActivityException {
@@ -595,6 +610,7 @@
return getRecommendActivityCount();
}
+ @Transactional
@Override
public void upgradeShareGoodsRecommendActivity(Long id) throws ActivityException {
// 鑾峰彇鍟嗗搧
@@ -699,4 +715,27 @@
public ActivityUser selectActivityUserByPrimaryKey(Long id) {
return activityUserMapper.selectByPrimaryKey(id);
}
+
+ @Transactional
+ @Override
+ public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods) {
+ List<RecommendActivityTaoBaoGoods> list = recommendActivityTaoBaoGoodsMapper
+ .selectByAuctionId(goods.getAuctionId());
+
+ BigDecimal d = TaoBaoUtil.getAfterUseCouplePrice(goods);
+
+ RecommendActivityTaoBaoGoods updateGoods = new RecommendActivityTaoBaoGoods();
+ if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
+ updateGoods.setDesc("鍒稿悗浠凤細楼" + d);
+ updateGoods.setState(RecommendActivityTaoBaoGoods.STATE_NORMAL);
+ } else {
+ updateGoods.setState(RecommendActivityTaoBaoGoods.STATE_UNSHELVE);
+ }
+
+ if (list != null)
+ for (RecommendActivityTaoBaoGoods tbGoods : list) {
+ updateGoods.setId(tbGoods.getId());
+ recommendActivityTaoBaoGoodsMapper.updateByPrimaryKeySelective(updateGoods);
+ }
+ }
}
--
Gitblit v1.8.0