From 0753e8e2febe83f13d9d7a6071fa5f7b57d7d7f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 10:28:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 2130fc3..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
@@ -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, null);
+ long num = integralExchangeRecordMapper.countRecordByUid(id, uid, 1);
Integer upperLimit = exchange.getUpperLimit();
if (upperLimit == null) {
progress = progress.replace("{宸插厬鎹", num + "").replace("/{涓婇檺鏁皚", "");
--
Gitblit v1.8.0