From e74819e845de27735605c8116ee73768560e0fd9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 03 六月 2020 15:17:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
index 7f1d6bc..bca22f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
@@ -336,6 +336,8 @@
return;
}
+ long count = 0;
+
List<Extract> list = null;
String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.extractRecord);
if (!StringUtil.isNullOrEmpty(redisContent)) {
@@ -344,13 +346,14 @@
}.getType());
}
- // 鏌ヨ鐪熷疄
- long count = 0;
- if (list == null) {
+ if (list != null && list.size() > 0) {// 鏈夐瑙堟暟鎹�
+ count=list.size();
+ } else {// 鏃犻瑙堟暟鎹�
list = extractService.getExtractSucceedRecord(page, Constant.PAGE_SIZE, uid);
count = extractService.countExtractSucceedRecord(uid);
}
+ // 鏌ヨ鐪熷疄
if (list == null)
list = new ArrayList<>();
@@ -371,7 +374,7 @@
}
JSONObject json = new JSONObject();
- json.put("count", count == 0 ? list.size() : 0);
+ json.put("count", count);
json.put("list", JSONArray);
out.print(JsonUtil.loadTrueResult(json));
}
--
Gitblit v1.8.0