From 4114e871bcb3dce771b6aed64a1027d0bbb95ca6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 五月 2019 15:28:37 +0800
Subject: [PATCH] 增加动态用户
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java
index edaa733..db6ba3b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java
@@ -8,10 +8,11 @@
import javax.annotation.Resource;
-import org.jsoup.Jsoup;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.entity.FileUploadResult;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -22,12 +23,9 @@
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.exception.ActivityException;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
-import org.yeshi.utils.entity.FileUploadResult;
import net.sf.json.JSONObject;
@@ -97,18 +95,6 @@
if (page <= 0)
page = 1;
List<RecommendActivity> list = activityService.getRecommendActivityListCache(page, Constant.PAGE_SIZE);
- // 杩囨护涓�閬�
- if (list != null)
- for (RecommendActivity activity : list) {
- if (!StringUtil.isNullOrEmpty(activity.getTitle())) {
- activity.setTitle(Jsoup.parse(activity.getTitle()).text());
- if (activity.getShareCount() >= 10000)
- activity.setShareCountShow(
- NumberUtil.get1PointNumber(activity.getShareCount() / 10000.0) + "涓�");
- else
- activity.setShareCountShow(activity.getShareCount() + "");
- }
- }
long count = activityService.getRecommendActivityCountCache();
JSONObject data = new JSONObject();
data.put("data", getGson().toJson(list));
@@ -134,6 +120,9 @@
imgList.add(uploadResult.getUrl());
data.put("shareImgs", imgList);
out.print(JsonUtil.loadTrueResult(data));
+ activityService.addShareCount(activityId, 1);
+ } catch (UserShareGoodsRecordException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
} catch (ActivityException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
}
@@ -151,6 +140,9 @@
try {
JSONObject data = activityService.shareGoodsV2(uid, activityId);
out.print(JsonUtil.loadTrueResult(data));
+ activityService.addShareCount(activityId, 1);
+ } catch (UserShareGoodsRecordException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
} catch (ActivityException e) {
out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
e.printStackTrace();
@@ -173,6 +165,8 @@
data.put("shareTitle", result.getTitle());
data.put("shareImgs", result.getImgList());
out.print(JsonUtil.loadTrueResult(data));
+ } catch (UserShareGoodsRecordException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
} catch (ActivityException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
}
@@ -197,6 +191,7 @@
data.put("shareTitle", result.getTitle());
data.put("shareImgs", imgList);
out.print(JsonUtil.loadTrueResult(data));
+ activityService.addShareCount(activityId, 1);
} catch (ActivityException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
}
--
Gitblit v1.8.0