From b0d445fda153e5dac63ad66c8b74191601f0a4ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 16:00:59 +0800
Subject: [PATCH] 兑换免单券 提示语修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
index 5f6f6a6..2130fc3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
@@ -66,7 +66,7 @@
 			Long id = exchange.getId();
 			if (type == ExchangeTypeEnum.freeCouponBuy) {
 				// 娉細鍥犺嚜璐厤鍗曞埜锛屼竴涓敤鎴峰彧鑳藉厬鎹竴娆★紝鍒欏綋鍓嶇敤鎴蜂竴鏃﹀厬鎹㈡垚鍔燂紝鑷喘鍏嶅崟鍒稿厬鎹㈠叆鍙f案涔呭湪褰撳墠鐢ㄦ埛閲戝竵鍏戞崲鍒楄〃涓秷澶便��
-				long num = integralExchangeRecordMapper.countRecordByUid(id, uid);
+				long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
 				if (num >= 1) {
 					listValid.remove(i);
 					i --;
@@ -100,7 +100,7 @@
 				continue;
 			
 			// 浠婃棩鍏戞崲鎯呭喌
-			long num = integralExchangeRecordMapper.countRecordByUid(id, uid);
+			long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
 			Integer upperLimit = exchange.getUpperLimit();
 			if (upperLimit == null) {
 				progress = progress.replace("{宸插厬鎹", num + "").replace("/{涓婇檺鏁皚", "");
@@ -113,8 +113,8 @@
 	}
 	
 	@Override
-	public long countRecordByUid(long exchangeid, Long uid){
-		return integralExchangeRecordMapper.countRecordByUid(exchangeid, uid);
+	public long countRecordByUid(long exchangeid, Long uid, Integer today){
+		return integralExchangeRecordMapper.countRecordByUid(exchangeid, uid, today);
 	}
 	
 	@Override

--
Gitblit v1.8.0