From 59ce2452667a57caf547a753913cf5e573c8cc39 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 19 八月 2019 18:05:47 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
index 516d376..9ae2299 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -202,16 +202,16 @@
return;
}
- Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {}.getType());
try {
Integer goldCoin = integralTaskRecordService.receiveGoldCoin(uid, idList);
+ Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {}.getType());
List<IntegralTaskRecord> list = null;
if (gidList != null && gidList.size() > 0) {
- list = integralTaskRecordService.listNotReceived(5 - gidList.size(), uid);
+ list = integralTaskRecordService.listNotReceivedExcludeId(5 - gidList.size(), uid, gidList);
} else {
- list = integralTaskRecordService.listNotReceived(5, uid);
+ list = integralTaskRecordService.listNotReceivedExcludeId(5, uid, null);
}
if (list == null) {
--
Gitblit v1.8.0