From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
index 927aa11..3109545 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.h5;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
@@ -11,7 +12,9 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.xcx.StrategyPicture;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.StrategyPictureService;
import com.yeshi.fanli.util.StringUtil;
import org.yeshi.utils.JsonUtil;
@@ -24,6 +27,9 @@
@Resource
private StrategyPictureService strategtPictureService;
+
+ @Resource
+ private ConfigService configService;
/**
*
@@ -56,12 +62,23 @@
}
@RequestMapping(value = "getStrategyPictureList")
- public void strategyPicture(String callback, PrintWriter out) {
+ public void strategyPicture(String callback, AcceptData acceptData, PrintWriter out) {
List<StrategyPicture> list = strategtPictureService.getStrategyPictureListCache();
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
- if (StringUtil.isNullOrEmpty(callback))
- out.print(JsonUtil.loadTrueResult(gson.toJson(list)));
- else
+ if (StringUtil.isNullOrEmpty(callback)) {
+ List<StrategyPicture> newList = new ArrayList<StrategyPicture>();
+ newList.addAll(list);
+ if (acceptData != null && "ios".equalsIgnoreCase(acceptData.getPlatform())
+ && !StringUtil.isNullOrEmpty(acceptData.getVersion())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ for (int i = 0; i < newList.size(); i++) {
+ if (newList.get(i).getTitle().contains("璧氶挶")) {
+ newList.remove(i);
+ i--;
+ }
+ }
+ out.print(JsonUtil.loadTrueResult(gson.toJson(newList)));
+ } else
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(list))));
}
--
Gitblit v1.8.0