From 0622fc9c8a464a1260ebca4071a2cad9c83a5a9a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 12 九月 2019 15:52:42 +0800
Subject: [PATCH] 返利奖励券 跳转订单 不显示订单上方统计信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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..c6c55b1 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
@@ -173,7 +173,7 @@
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
root.put("scoreExchange", getScoreExchangeInfo(acceptData));
- if (VersionUtil.greaterThan_2_0_0(acceptData.getPlatform(), acceptData.getVersion()))
+ if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))
root.put("searchDiscovery", getSearchDiscoveryInfo(acceptData));
out.print(JsonUtil.loadTrueResult(root));
@@ -364,7 +364,7 @@
for (int i = 0; i < arrayKeys.size(); i++) {
String name = arrayKeys.get(i).toString();
JSONObject params = new JSONObject();
- params.put("searchKey", name);
+ params.put("content", name);
SearchKeyVO keyVO = new SearchKeyVO();
keyVO.setName(name);
@@ -721,21 +721,39 @@
*/
@RequestMapping(value = "getSpecialChannelActivity")
public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
- List<Special> list = specialService.listByPlaceKey("special_channel_activity");
+
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+
+ 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++) {
Special special = list.get(i);
if (special.getState() == 1L) {
list.remove(i--);
- }else{
+ } 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--);
+ } 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