From 207ae7df18d601d839d945d32c5519f95b959a92 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 十二月 2019 11:28:49 +0800
Subject: [PATCH] 文章
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index 50a59ae..3d2b8a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -1,7 +1,6 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -352,7 +351,7 @@
@RequestMapping(value = "getList", method = RequestMethod.POST)
public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
getListV3(acceptData, page, cid, uid, out);
return;
}
@@ -407,7 +406,7 @@
public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
getShopInfoV3(acceptData, page, id, uid, out);
return;
}
@@ -576,7 +575,7 @@
@RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
getHistoryV3(acceptData, page, uid, type, out);
return;
}
@@ -663,19 +662,25 @@
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
return;
}
-
if (cid != null && cid == 0) {
cid = null;
}
+
JSONObject data = new JSONObject();
+ if (page == 1 && cid == null) { // 绮鹃�夐〉banner
+ List<SwiperPicture> banners = swiperPictureService.getByBannerCardAndVersion("brand_banners",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ if (banners == null)
+ banners = new ArrayList<>();
+ data.put("banners", JsonUtil.getApiCommonGson().toJson(banners));
+ }
+
if (page == 1 && cid != null) {
List<BrandInfo> brandlist = brandInfoService.listValidByCidToApp(cid);
if(brandlist == null)
brandlist = new ArrayList<BrandInfo>();
data.put("brandlist", JsonUtil.getApiCommonGson().toJson(brandlist));
}
-
long count = brandInfoService.countValidByCidToApp(cid);
--
Gitblit v1.8.0