From 9129d51874b36943419994937af56c2f73aed1a0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 03 六月 2020 15:14:10 +0800
Subject: [PATCH] 唯品会,苏宁相关bug修改

---
 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 41b24cb..f5b16d6 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