From 032eddac4b4627f855905e8e846b0388483e3979 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 11:58:50 +0800
Subject: [PATCH] 客户端参数/系统参数增加版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 12 +++++++++---
1 files changed, 9 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 ac5e27f..6a0def3 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
@@ -723,9 +723,10 @@
public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
-
- List<Special> list = specialService.listByPlaceKey("special_channel_activity",platformCode, Integer.parseInt(acceptData.getVersion()));
-
+
+ List<Special> list = specialService.listByPlaceKey("special_channel_activity", platformCode,
+ Integer.parseInt(acceptData.getVersion()));
+
long time = System.currentTimeMillis();
// 鍒犻櫎灏氭湭鍚敤鐨勮繃鏈熺殑
for (int i = 0; i < list.size(); i++) {
@@ -733,6 +734,11 @@
if (special.getState() == 1L) {
list.remove(i--);
} else {
+ if (special.getStartTime() != null && special.getEndTime() != null)
+ special.setTimeTask(true);
+ else
+ special.setTimeTask(false);
+
if (special.isTimeTask()) {
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
list.remove(i--);
--
Gitblit v1.8.0