From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 198 +++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 80 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 5621bc4..8aae473 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
@@ -4,9 +4,11 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.cache.annotation.Cacheable;
@@ -96,10 +98,10 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
+
@Resource
private UserShareGoodsRecordService userShareGoodsRecordService;
-
+
@Resource
private CommonGoodsService commonGoodsService;
@@ -119,146 +121,160 @@
}
@Override
- public ActivityShareResult shareActivityGoods(Long uid, Long activityId) throws ActivityException {
-
+ public ActivityShareResult shareActivityGoods(Long uid, Long activityId)
+ throws ActivityException, UserShareGoodsRecordException {
+
RecommendActivity activity = recommendActivityMapper.selectByPrimaryKey(activityId);
-
+
if (activity == null)
throw new ActivityException(2, "鍔ㄦ�佷笉瀛樺湪");
-
+
if (activity.getType() != RecommendActivity.TYPE_SHARE_GOODS)
throw new ActivityException(3, "涓嶅睘浜庡垎浜晢鍝佸姩鎬�");
-
+
ActivityShareResult result = new ActivityShareResult();
-
+
String title = activity.getTitle().replace("<br>", "/n").replace("<p>", "").replace("</p>", "");
if (title != null && title.trim().endsWith("/n"))
title = title.trim().substring(0, title.trim().length() - 2);
result.setTitle(title);
List<FileUploadResult> imgList = new ArrayList<>();
-
+
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
-
+
if (activity.getGoodsList() != null) {
-
+
activity.getGoodsList().stream().parallel().forEach(goodsActivity -> {
-
+
try {
- TaoBaoGoodsBrief goodsBrief =
- redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsActivity.getAuctionId()));
+ TaoBaoGoodsBrief goodsBrief = redisManager
+ .getTaoBaoGoodsBrief(Long.parseLong(goodsActivity.getAuctionId()));
listGoodsBrief.add(goodsBrief);
} catch (TaobaoGoodsDownException e) {
-
- CommonGoods commonGoods= commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(Long.parseLong(goodsActivity.getAuctionId()),
- CommonGoods.GOODS_TYPE_TB);
+
+ CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
+ Long.parseLong(goodsActivity.getAuctionId()), CommonGoods.GOODS_TYPE_TB);
if (commonGoods != null) {
- TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
+ TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
goodsBrief.setState(1);
listGoodsBrief.add(goodsBrief);
}
-
+
try {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍟嗗搧鍑洪敊-鍟嗗搧ID:" + goodsActivity.getAuctionId(), "--");
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍟嗗搧鍑洪敊-鍟嗗搧ID:" + goodsActivity.getAuctionId(), "--");
} catch (Exception e1) {
e1.printStackTrace();
}
}
});
}
-
- if (listGoodsBrief.size() > 0) {
- try {
- FileUploadResult loadResult = userShareGoodsRecordService.save(uid,
- ShareSourceTypeEnum.activity, title, listGoodsBrief);
- imgList.add(loadResult);
-
- } catch (UserShareGoodsRecordException e) {
- throw new ActivityException(1, e.getMsg());
- }
- } else {
+
+ if (listGoodsBrief.size() < 1) {
throw new ActivityException(1, "鍟嗗搧涓嬫灦");
}
-
+
+ Map<String, Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title,
+ listGoodsBrief);
+ imgList.add((FileUploadResult) map.get("loadResult"));
result.setImgList(imgList);
+
return result;
}
-
-
+
@Override
- public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException {
-
+ public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException, UserShareGoodsRecordException {
+
RecommendActivity activity = recommendActivityMapper.selectByPrimaryKey(activityId);
-
+
if (activity == null)
throw new ActivityException(2, "鍔ㄦ�佷笉瀛樺湪");
-
+
if (activity.getType() != RecommendActivity.TYPE_SHARE_GOODS)
throw new ActivityException(3, "涓嶅睘浜庡垎浜晢鍝佸姩鎬�");
-
+
ActivityShareResult result = new ActivityShareResult();
-
+
String title = activity.getTitle().replace("<br>", "/n").replace("<p>", "").replace("</p>", "");
if (title != null && title.trim().endsWith("/n"))
title = title.trim().substring(0, title.trim().length() - 2);
-
+
result.setTitle(title);
-
- List<FileUploadResult> imgList = new ArrayList<>();
+
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
-
+
if (activity.getGoodsList() != null) {
activity.getGoodsList().stream().parallel().forEach(goodsActivity -> {
try {
- TaoBaoGoodsBrief goodsBrief =
- redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsActivity.getAuctionId()));
+ TaoBaoGoodsBrief goodsBrief = redisManager
+ .getTaoBaoGoodsBrief(Long.parseLong(goodsActivity.getAuctionId()));
listGoodsBrief.add(goodsBrief);
-
+
} catch (TaobaoGoodsDownException e) {
-
- CommonGoods commonGoods= commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(Long.parseLong(goodsActivity.getAuctionId()),
- CommonGoods.GOODS_TYPE_TB);
+
+ CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
+ Long.parseLong(goodsActivity.getAuctionId()), CommonGoods.GOODS_TYPE_TB);
if (commonGoods != null) {
- TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
+ TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
goodsBrief.setState(1);
listGoodsBrief.add(goodsBrief);
}
-
+
try {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍟嗗搧鍑洪敊-鍟嗗搧ID:" + goodsActivity.getAuctionId(), "--");
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍟嗗搧鍑洪敊-鍟嗗搧ID:" + goodsActivity.getAuctionId(), "--");
} catch (Exception e1) {
e1.printStackTrace();
}
}
});
}
-
- FileUploadResult loadResult = null;
- if (listGoodsBrief.size() > 0) {
- try {
- loadResult = userShareGoodsRecordService.save(uid,
- ShareSourceTypeEnum.activity, title, listGoodsBrief);
- imgList.add(loadResult);
-
- } catch (UserShareGoodsRecordException e) {
- throw new ActivityException(1, e.getMsg());
- }
- } else {
+
+ if (listGoodsBrief.size() < 1) {
throw new ActivityException(1, "鍟嗗搧涓嬫灦");
}
-
- String revenue = "";
+
+ String fontColor1 = "#000000";
+ String fontColor2 = "#E5005C";
+ JSONArray array = new JSONArray();
+
+ 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) {
- revenue = totalGetMoney.replace("棰勮鍒嗕韩濂栭噾", listGoodsBrief.size()+"涓晢鍝侀浼板垎浜閲�");
+ String[] split = totalGetMoney.split("锛�");
+ if (split != null) {
+ revenue = split[1];
+ }
+
+ String[] splitMoney = totalGetMoney.split("楼");
+ if (splitMoney != null) {
+ shareMoney = splitMoney[1];
+ }
}
-
+
+ JSONObject contentJson2 = new JSONObject();
+ contentJson2.put("color", fontColor2);
+ contentJson2.put("content", revenue);
+
+ array.add(contentJson1);
+ array.add(contentJson2);
+
JSONObject data = new JSONObject();
- data.put("shareImg", loadResult);
- data.put("revenue", revenue);
- data.put("notifyDesc", configService.get("goods_share_notify"));
+
+ 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"));
return data;
-
+
}
@Override
@@ -307,9 +323,9 @@
activity.setTop(top);
activity.setType(RecommendActivity.TYPE_SHARE_GOODS);
recommendActivityMapper.insertSelective(activity);
-
+
List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
-
+
BigDecimal taotaoMoney = new BigDecimal(0);
for (long auctionId : goodsList) {
TaoBaoGoodsBrief tb = null;
@@ -332,12 +348,12 @@
recommendActivityTaoBaoGoodsMapper.insertSelective(goods);
BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
taotaoMoney = taotaoMoney.add(money);
-
+
// 杞崲绠�鐗堝晢鍝佷俊鎭�
CommonGoods commonGoods = CommonGoodsFactory.create(tb);
listCommonGoods.add(commonGoods);
}
-
+
try {
// 鏇存柊绠�鐗堜俊鎭�
commonGoodsService.addBatchCommonGoods(listCommonGoods);
@@ -347,7 +363,7 @@
RecommendActivity updateActivity = new RecommendActivity();
updateActivity.setId(activity.getId());
- updateActivity.setTotalGetMoney("棰勮鍒嗕韩濂栭噾锛毬�" + taotaoMoney.toString());
+ updateActivity.setTotalGetMoney("棰勪及鍒嗕韩濂栭噾锛毬�" + taotaoMoney.toString());
recommendActivityMapper.updateByPrimaryKeySelective(updateActivity);
return activity;
@@ -481,7 +497,7 @@
RecommendActivity updateActivity = new RecommendActivity();
updateActivity.setId(activity.getId());
- updateActivity.setTotalGetMoney("棰勮鍒嗕韩濂栭噾锛毬�" + taotaoMoney.toString());
+ updateActivity.setTotalGetMoney("棰勪及鍒嗕韩濂栭噾锛毬�" + taotaoMoney.toString());
recommendActivityMapper.updateByPrimaryKeySelective(updateActivity);
return activity;
@@ -620,7 +636,7 @@
update.setId(goods.getId());
update.setState(RecommendActivityTaoBaoGoods.STATE_UNSHELVE);
recommendActivityTaoBaoGoodsMapper.updateByPrimaryKeySelective(update);
- taoBaoGoodsUpdateService.downTaoBaoGoods(Long.parseLong(goods.getAuctionId()));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(goods.getAuctionId()));
}
}
}
@@ -689,4 +705,26 @@
public ActivityUser selectActivityUserByPrimaryKey(Long id) {
return activityUserMapper.selectByPrimaryKey(id);
}
+
+ @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