From ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 17:31:18 +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/integral/IntegralTaskRecordServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
index bf4477a..d3e7a83 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.integral.IntegralTask;
import com.yeshi.fanli.entity.integral.IntegralTask.FrequencyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskClass;
+import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
@@ -251,23 +252,26 @@
if (integralTask == null)
return false;
- int num = 0;
- FrequencyEnum frequency = integralTask.getFrequency();
- if (frequency == FrequencyEnum.everyday) {
- num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, record.getCreateTime());
- } else if (frequency == FrequencyEnum.onlyOne) {
- num = 1;
- }
-
- if (num <= 0)
- num = 1;
-
- String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "娆�";
-
// 鍔犲叆鏄庣粏
IntegralDetail detail = new IntegralDetail();
+ if (UniqueKeyEnum.dailySign == taskClass.getUniqueKey()) {
+ detail.setTitle(taskClass.getName() + "-" + integralTask.getName());
+ } else {
+ int num = 0;
+ FrequencyEnum frequency = integralTask.getFrequency();
+ if (frequency == FrequencyEnum.everyday) {
+ num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, TimeUtil.getWholeTime(record.getCreateTime().getTime()));
+ } else if (frequency == FrequencyEnum.onlyOne) {
+ num = 1;
+ }
+
+ if (num <= 0)
+ num = 1;
+ String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "娆�";
+ detail.setTitle(title);
+ }
+
detail.setUid(uid);
- detail.setTitle(title);
detail.setMoney(record.getGoldCoin());
detail.setCreateTime(record.getCreateTime());
integralDetailService.insertSelective(detail);
--
Gitblit v1.8.0