From c6b07c598a9585a68547ffc2a9b540ca74a3920b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 九月 2019 18:36:35 +0800
Subject: [PATCH] 项目名称bug修改,京东商品推荐修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 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 746b5d9..b667cd5 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
@@ -131,7 +131,7 @@
 		List<IntegralTaskRecord> listRecord = new ArrayList<IntegralTaskRecord>();
 		try {
 			// 绛惧埌鏃堕棿姝e簭搴忔煡璇㈣繎7澶╂暟鎹�
-			List<IntegralTaskRecord> list = integralTaskRecordMapper.listDaySignRecord(uid, cid);
+			List<IntegralTaskRecord> list = integralTaskRecordMapper.listDateSignRecord(uid, cid);
 			if (list != null && list.size() > 0) {
 				Date date = new Date();
 				for (IntegralTaskRecord record : list) {
@@ -149,6 +149,33 @@
 		return listRecord;
 	}
 
+	
+	@Override
+	public List<IntegralTaskRecord> getSign7DaysRecord(long uid, Long cid) {
+		List<IntegralTaskRecord> listRecord = new ArrayList<IntegralTaskRecord>();
+		try {
+			// 绛惧埌鏃堕棿姝e簭搴忔煡璇㈣繎7澶╂暟鎹�
+			List<IntegralTaskRecord> list = integralTaskRecordMapper.listDaySignRecord(uid, cid);
+			if (list != null && list.size() > 0) {
+				Date date = new Date();
+				for (IntegralTaskRecord record : list) {
+					Date createTime = record.getCreateTime();
+					if (DateUtil.daysBetween2(createTime, date) > 1) {
+						break; // 澶╂暟鏈繛缁�
+					}
+					date = createTime;
+					listRecord.add(record);
+					
+					if(listRecord.size() >= 7)
+						break;
+				}
+			}
+		} catch (Exception e) {
+			LogHelper.errorDetailInfo(e);
+		}
+		return listRecord;
+	}
+	
 	@Override
 	public List<IntegralTaskRecord> listNotReceived(int count, long uid) {
 		return integralTaskRecordMapper.listNotReceived(count, uid);
@@ -372,7 +399,7 @@
 	}
 	
 	
-//	@Async()
+	@Async()
 	@Override
 	public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {
 		if (uid == null || originUid == null)
@@ -384,7 +411,7 @@
 		firstOrderReward(uid, originUid, Integer.parseInt(reward), "涓�", beizu);
 	}
 	
-//	@Async()
+	@Async()
 	@Override
 	public void firstRebateOrderRewardBossSuper(Long uid, Long originUid, String beizu) {
 		if (uid == null || originUid == null)
@@ -397,7 +424,7 @@
 	}
 	
 	
-//	@Async()
+	@Async()
 	@Override
 	public void firstShareOrderReward(Long uid, String beizu) {
 		if(uid == null)
@@ -410,7 +437,7 @@
 	}
 	
 	
-//	@Async()
+	@Async()
 	@Override
 	public void firstSharerOrderRewardBoss(Long uid, Long originUid, String beizu) {
 		if (uid == null || originUid == null)

--
Gitblit v1.8.0