From 972d3bc71115ec977dccf835fbcd148da3bcc86c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 16:41:49 +0800
Subject: [PATCH] 统计可用的免单券数量-countUsableFreeCouponForBuy
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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..588a874 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
@@ -75,10 +75,20 @@
}
// 閭�璇风爜婵�娲诲崱锛屽厬鎹㈤」锛屽鏋滃綋鍓嶇敤鎴峰凡缁忔縺娲讳簡閭�璇峰姛鑳斤紝鍒欎笉闇�瑕佹樉绀鸿鍏戞崲椤广��
- if (type == ExchangeTypeEnum.inviteCodeActivate && hasCode) {
- listValid.remove(i);
- i --;
- continue;
+ if (type == ExchangeTypeEnum.inviteCodeActivate) {
+ if (hasCode) {
+ listValid.remove(i);
+ i --;
+ continue;
+ }
+
+ // 鍏戞崲涓�娆′箣鍚庨殣钘�
+ long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
+ if (num >= 1) {
+ listValid.remove(i);
+ i --;
+ continue;
+ }
}
// 閭�璇风爜鍙戝竷鍗★紝鍏戞崲椤癸紝濡傛灉褰撳墠鐢ㄦ埛鏈縺娲婚個璇峰姛鑳斤紝鍒欎笉闇�瑕佹樉绀鸿鍏戞崲椤广��
@@ -99,8 +109,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