From ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 17:31:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 cec6d33..dd8dbbc 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,10 @@
}
});
+ if (once) // 鍏戞崲涔嬪悗娑堝け
+ exchange = null;
+
+
return exchange;
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0