From bc6df1cbd259c80539d11ae0107ccb938b570266 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
index e63e0cb..11d78ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
@@ -218,12 +218,13 @@
String thing = "";
String thingNum = "";
int couponNews = 0;
+ boolean once = false; // 鍏戞崲涓�娆℃槸鍚︽秷澶�
try {
if (ExchangeTypeEnum.freeCouponBuy == type) {
thing = "鑷喘鍏嶅崟鍒�";
thingNum = "1寮�";
userSystemCouponService.exchangeCoupon(uid, type.name(), UserSystemCoupon.SOURCE_EXCHANGE, null);
-
+ once = true;
couponNews = 1;
} else if (ExchangeTypeEnum.freeCouponGive == type) {
thing = "璧犻�佸厤鍗曞埜";
@@ -242,6 +243,9 @@
if(codePublishRecordService.countValidRecord(uid) > 0)
throw new IntegralExchangeException(1, "涓夊ぉ涔嬪唴涓嶅彲閲嶅鍏戞崲");
codePublishRecordService.publishInviteCode(uid);
+
+ exchange.setNeedJump(true);
+ exchange.setBtnName("鍘绘煡鐪�");
} else if (ExchangeTypeEnum.taoLiJin == type) {
thing = "鎺ㄥ箍绾㈠寘";
thingNum = exchange.getAmount() + "鍏�";
@@ -317,6 +321,9 @@
}
});
+ if (once) // 鍏戞崲涔嬪悗娑堝け
+ exchange = null;
+
return exchange;
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -367,7 +374,7 @@
@Override
- public void exchangeInviteCode(Long uid, Long id) throws IntegralExchangeException {
+ public String exchangeInviteCode(Long uid, Long id) throws IntegralExchangeException {
if (uid == null || uid <= 0)
throw new IntegralExchangeException(1, "鐢ㄦ埛鏈櫥褰�");
@@ -401,7 +408,6 @@
throw new IntegralExchangeException(1, "鍏戞崲澶辫触锛岃鐢ㄦ埛閭�璇风爜涓嶅瓨鍦�");
String inviteCode = inviteExtra.getInviteCode();
- userInfoExtraService.activateInviteCode(uid, inviteExtra.getInviteCode());
// 鍓╀綑閲戝竵
int surplus = goldCoinHas.intValue() - goldCoin.intValue();
@@ -442,11 +448,11 @@
userOtherMsgNotificationService.exchangeMsg(uid, beizu, msgOther);
}
});
+
+ return inviteCode;
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
throw new IntegralExchangeException(1, "鍏戞崲澶辫触");
}
-
-
}
}
--
Gitblit v1.8.0