From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 五月 2020 19:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
index d913efe..f14d402 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
@@ -38,6 +38,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
@@ -203,10 +204,14 @@
return;
}
+ boolean notBackSuVip = false;
+ if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
+ notBackSuVip = true;
+
List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,
- Constant.PAGE_SIZE, goodsType);
+ Constant.PAGE_SIZE, goodsType, notBackSuVip);
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, notBackSuVip);
JSONObject data = new JSONObject();
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
@@ -329,8 +334,13 @@
return;
}
+ boolean notBackSuVip = false;
+ if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
+ notBackSuVip = true;
+
+
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,
- 20, goodsType);
+ 20, goodsType, notBackSuVip);
GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
gsonBuilder.excludeFieldsWithoutExposeAnnotation();
@@ -345,7 +355,7 @@
}
});
- long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, notBackSuVip);
JSONArray array = new JSONArray();
if (list != null && list.size() > 0) {
--
Gitblit v1.8.0