From 9dfd71c4bde5afe4bf9bb9a8ec07549e4790b992 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:58:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index 10e1ca3..a5c692f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -721,21 +721,29 @@
*/
@RequestMapping(value = "getSpecialChannelActivity")
public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
+ long time = System.currentTimeMillis();
List<Special> list = specialService.listByPlaceKey("special_channel_activity");
// 鍒犻櫎灏氭湭鍚敤鐨勮繃鏈熺殑
for (int i = 0; i < list.size(); i++) {
Special special = list.get(i);
if (special.getState() == 1L) {
list.remove(i--);
- }else{
-
+ } else {
+ if (special.isTimeTask()) {
+ if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
+ list.remove(i--);
+ } else// 璁剧疆鍊掕鏃�
+ {
+ special.setCountDownTime((special.getEndTime().getTime() - time) / 1000);
+ }
+ }
}
}
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
- data.put("count", count);
+ data.put("count", list.size());
data.put("list", gson.toJson(list));
if (!StringUtil.isNullOrEmpty(callback)) {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0