From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 6b272d8..d53ff3a 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
@@ -290,7 +290,7 @@
if (num <= 0)
num = 1;
- String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "娆�";
+ String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
detail.setTitle(title);
}
@@ -303,9 +303,9 @@
}
@Override
- public Integer countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {
+ public int countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {
if (day == null)
- return null;
+ return 0;
Date minTime = new Date(
TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(day.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));
Date maxTime = new Date(minTime.getTime() + 1000 * 60 * 60 * 24L);
--
Gitblit v1.8.0