From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 05 十一月 2019 11:37:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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 2722005..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 @@ -306,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 + "娆�"; @@ -375,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