From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 18 十二月 2018 11:17:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 67 +++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 29 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..87fb80f 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; @@ -119,7 +121,7 @@ } @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); @@ -166,26 +168,20 @@ }); } - 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); @@ -203,7 +199,6 @@ result.setTitle(title); - List<FileUploadResult> imgList = new ArrayList<>(); List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>(); if (activity.getGoodsList() != null) { @@ -232,30 +227,44 @@ }); } - 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 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]; + } } + 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("shareId", map.get("shareId")); + data.put("shareImg", map.get("loadResult")); + data.put("notifyDesc", configService.get("goods_share_multiple_notify")); return data; -- Gitblit v1.8.0