From dcfd801ea435c1c87ed47f2ee24cdabaaf230d6f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 31 三月 2020 12:15:56 +0800
Subject: [PATCH] 大淘客商品过滤修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
index 709e298..5e153dd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
@@ -2,7 +2,9 @@
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -52,7 +54,22 @@
pageIndex = 1;
}
+ List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android");
+ Map<Integer, String> androidMapName = new HashMap<>();
+ for (AppVersionInfo version : versionList)
+ androidMapName.put(version.getVersionCode(), version.getVersion());
+
+ versionList = appVersionService.getAppVersionInfoListByPlatform("ios");
+ Map<Integer, String> iosMapName = new HashMap<>();
+ for (AppVersionInfo version : versionList)
+ iosMapName.put(version.getVersionCode(), version.getVersion());
+
List<Config> list = configService.listObjects(key, pageIndex);
+
+ for (Config config : list) {
+ config.setMinAndroidVersion(androidMapName.get(config.getMinAndroidVersionCode()));
+ config.setMinIosVersion(iosMapName.get(config.getMinIosVersionCode()));
+ }
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
@@ -122,16 +139,13 @@
}
/**
- * 鏌ヨ鍒楄〃 - 鏂板悗鍙�
+ * 鐗堟湰鍙蜂俊鎭�
*
* @param callback
- * @param key
- * 鏌ヨ璇� 鍚嶇О
- * @param pageIndex
* @param out
*/
@RequestMapping(value = "getVersionList")
- public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out) {
+ public void getVersionList(String callback, PrintWriter out) {
try {
AppVersionInfo appVersionInfo = new AppVersionInfo();
@@ -155,10 +169,20 @@
List<AppVersionInfo> listAndroid = new ArrayList<AppVersionInfo>();
listAndroid.add(appVersionInfo);
listAndroid.addAll(list2);
+ //灏忕▼搴忕増鏈�
+ List<AppVersionInfo> list3 = appVersionService
+ .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_XCX);
+ if (list3 == null) {
+ list3 = new ArrayList<AppVersionInfo>();
+ }
+ List<AppVersionInfo> listWxmp = new ArrayList<AppVersionInfo>();
+ listWxmp.add(appVersionInfo);
+ listWxmp.addAll(list3);
JSONObject data = new JSONObject();
data.put("android", listAndroid);
data.put("ios", listIOS);
+ data.put("wxmp", listWxmp);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0