From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 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..c325006 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) {
// 娉細鍥犺嚜璐厤鍗曞埜锛屼竴涓敤鎴峰彧鑳藉厬鎹竴娆★紝鍒欏綋鍓嶇敤鎴蜂竴鏃﹀厬鎹㈡垚鍔燂紝鑷喘鍏嶅崟鍒稿厬鎹㈠叆鍙ｆ案涔呭湪褰撳墠鐢ㄦ埛閲戝竵鍏戞崲鍒楄〃涓秷澶便��
- long num = integralExchangeRecordMapper.countRecordByUid(id, uid);
+ long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
if (num >= 1) {
listValid.remove(i);
i --;
@@ -99,8 +99,18 @@
if (StringUtil.isNullOrEmpty(progress))
continue;
+ // 鑷喘鍏嶅崟鍒�-鍙兘鍏戞崲涓�娆�
+ if (type == ExchangeTypeEnum.freeCouponBuy) {
+ long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
+ if (num >= 1) {
+ listValid.remove(i);
+ i --;
+ continue;
+ }
+ }
+
// 浠婃棩鍏戞崲鎯呭喌
- long num = integralExchangeRecordMapper.countRecordByUid(id, uid);
+ long num = integralExchangeRecordMapper.countRecordByUid(id, uid, 1);
Integer upperLimit = exchange.getUpperLimit();
if (upperLimit == null) {
progress = progress.replace("{宸插厬鎹", num + "").replace("/{涓婇檺鏁皚", "");
@@ -113,8 +123,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