From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index bb73859..4e72297 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1733,9 +1733,10 @@
// 缂撳瓨鍗婁釜灏忔椂
redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
}
-
+ Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
JSONObject root = new JSONObject();
root.put("time", nextTime.getTimeInMillis());
+ root.put("endTime", endTime > 0? endTime : 0);
root.put("listgoods", array);
out.print(JsonUtil.loadTrueResult(root));
}
--
Gitblit v1.8.0