From 395cd4c4caf01e1b3ad134834e5c1db284b59074 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 11 四月 2020 18:18:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java
index a54f30b..a70edfb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java
@@ -247,22 +247,24 @@
thing = "鑷喘鍏嶅崟鍒�";
thingNum = "1寮�";
- userSystemCouponService.exchangeCoupon(uid, CouponTypeEnum.freeCouponBuy.name(),
- UserSystemCoupon.SOURCE_EXCHANGE, null);
+ userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCouponBuy, UserSystemCoupon.SOURCE_EXCHANGE,
+ 1, true);
+
once = true;
couponNews = 1;
} else if (ExchangeTypeEnum.freeCouponGive == type) {
thing = "璧犻�佸厤鍗曞埜";
thingNum = "1寮�";
- userSystemCouponService.exchangeCoupon(uid, CouponTypeEnum.freeCouponGive.name(),
- UserSystemCoupon.SOURCE_EXCHANGE, null);
+ userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCouponGive, UserSystemCoupon.SOURCE_EXCHANGE,
+ 1, true);
+
couponNews = 1;
} else if (ExchangeTypeEnum.rebatePercentCoupon == type) {
thing = "杩斿埄濂栧姳鍒�";
thingNum = "1寮�";
String percent = configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey());
- userSystemCouponService.exchangeCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
- UserSystemCoupon.SOURCE_EXCHANGE, new BigDecimal(percent));
+ userSystemCouponService.rewardCouponWin(uid, UserSystemCoupon.SOURCE_EXCHANGE, 1,
+ true, new BigDecimal(percent));
couponNews = 1;
} else if (ExchangeTypeEnum.inviteCodePublish == type) {
thing = "閭�璇风爜鍙戝竷鍗�";
@@ -335,15 +337,15 @@
// 娑堟伅
final String things = thing;
+ final String exNum = thingNum;
executor.execute(new Runnable() {
@Override
public void run() {
- MsgOtherExchangeContentDTO msgOther = new MsgOtherExchangeContentDTO();
- msgOther.setState("閲戝竵鍏戞崲鎴愬姛");
- msgOther.setExpend(goldCoin + "閲戝竵");
- msgOther.setTotalGold(surplus + "閲戝竵");
- msgOther.setThing(things);
- userOtherMsgNotificationService.exchangeMsg(uid, "", msgOther);
+ if (ExchangeTypeEnum.inviteCodePublish == type) {
+ userOtherMsgNotificationService.goldCoinExChangeMsg(uid, goldCoin, surplus, things, "1寮�");
+ } else {
+ userOtherMsgNotificationService.goldCoinExChangeMsg(uid, goldCoin, surplus, things, exNum);
+ }
}
});
@@ -458,19 +460,7 @@
executor.execute(new Runnable() {
@Override
public void run() {
- UserInfo userInfo = userInfoService.selectByPKey(record.getUid());
- if (userInfo == null)
- return;
-
- String beizu = "閭�璇蜂汉锛�" + userInfo.getNickName() + "锛岄個璇风爜锛�" + inviteCode;
-
- MsgOtherExchangeContentDTO msgOther = new MsgOtherExchangeContentDTO();
- msgOther.setState("閲戝竵鍏戞崲鎴愬姛");
- msgOther.setExpend(goldCoin + "閲戝竵");
- msgOther.setTotalGold(surplus + "閲戝竵");
- msgOther.setThing("閭�璇风爜婵�娲诲崱");
-
- userOtherMsgNotificationService.exchangeMsg(uid, beizu, msgOther);
+ userOtherMsgNotificationService.goldCoinExChangeMsg(uid, goldCoin, surplus, "閭�璇风爜婵�娲诲崱", "1寮�");
}
});
--
Gitblit v1.8.0