From 6367f20b7a8fe23d7a547b83f1e30321b84d09f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 02 七月 2019 09:38:35 +0800
Subject: [PATCH] 商品详情对象修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index 1933e5e..867e0e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -152,17 +152,14 @@
page = 1;
}
- long count = 0;
+
int pageSize = Constant.PAGE_SIZE;
-
List<UserTaoLiJinRecordVO> list = userTaoLiJinRecordService.getRecordByUid((page - 1) * pageSize, pageSize, uid);
-
if (list == null) {
list = new ArrayList<UserTaoLiJinRecordVO>();
- } else if (list.size() > 0) {
- count = userTaoLiJinRecordService.countRecordByUid(uid);
- }
+ }
+ long count = userTaoLiJinRecordService.countShareRecordByUid(uid);
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -394,7 +391,7 @@
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
- data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));
+ data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));
out.print(JsonUtil.loadTrueResult(data));
return;
@@ -403,7 +400,6 @@
// 鐧诲綍鐢ㄦ埛
JSONObject data = new JSONObject();
- data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));
data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));
if (type.equals(TaoLiJinOriginEnum.newbiesWin.name())) {
@@ -429,6 +425,7 @@
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
+ data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));
} else if(type.equals(TaoLiJinOriginEnum.rankWin.name())) {
boolean isRank = false;
@@ -464,6 +461,7 @@
data.put("jumpName", "鍘绘煡鐪�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_rank"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip"));
+ data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));
out.print(JsonUtil.loadTrueResult(data));
return;
} else {
@@ -475,6 +473,7 @@
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));
+ data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));
}
} else {
--
Gitblit v1.8.0