From 0971f31cfec774b5c8276990a7c01c312a21651c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 16 五月 2019 18:26:05 +0800
Subject: [PATCH] 商品详情添加 无返利链接 + 邀请帮助链接 + 动态用户根据分类添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 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 7580e1a..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,14 +8,10 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
-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.NumberUtil;
import org.yeshi.utils.entity.FileUploadResult;
import com.google.gson.Gson;
@@ -30,7 +26,8 @@
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 net.sf.json.JSONObject;
/**
* 鍔ㄦ��
@@ -98,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));
@@ -135,7 +120,7 @@
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) {
@@ -155,6 +140,7 @@
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) {
@@ -205,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