From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
index 3f99051..8eb2f47 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
@@ -236,16 +236,10 @@
totalGoldCoin += record.getGoldCoin();
}
- Integer goldCoin = userInfoExtra.getGoldCoin();
- if (goldCoin == null)
- goldCoin = 0;
-
- goldCoin = goldCoin + totalGoldCoin;
-
// 鏇存柊閲戝竵
- userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);
+ userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
- return goldCoin;
+ return totalGoldCoin+(userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin());
}
@Transactional
@@ -312,7 +306,7 @@
FrequencyEnum frequency = integralTask.getFrequency();
if (frequency == FrequencyEnum.everyday) {
int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
- TimeUtil.getWholeTime(record.getCreateTime().getTime()));
+ TimeUtil.getWholeTime(record.getCreateTime().getTime()), record.getId());
if (num <= 0)
num = 1;
String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
@@ -381,6 +375,14 @@
return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
}
+
+ @Override
+ public long getTotalGoldCoinByUid(Long uid) {
+ return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
+ }
+
+
+
@Async()
@Override
public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {
--
Gitblit v1.8.0