From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index 2d99c98..c9ad810 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -1515,11 +1515,11 @@
public void collectionGoodsList(AcceptData acceptData, long uid, int page, PrintWriter out) {
List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page + 1,
- Constant.PAGE_SIZE, Constant.SOURCE_TYPE_TAOBAO);
+ Constant.PAGE_SIZE, Constant.SOURCE_TYPE_TAOBAO, true);
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, Constant.SOURCE_TYPE_TAOBAO);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, Constant.SOURCE_TYPE_TAOBAO, true);
JSONObject data = new JSONObject();
List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();
@@ -2228,7 +2228,7 @@
if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
UserInviteLevelEnum level = null;
// VIP棰勮淇℃伅
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.mineInfo);
if (!StringUtil.isNullOrEmpty(redisContent)) {
MineInfoVO vo = new Gson().fromJson(redisContent, MineInfoVO.class);
@@ -2303,6 +2303,8 @@
data.put("vipAction", vipAction);
}
+
+ data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0