From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 863ed09..a54f30b 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
@@ -20,6 +20,7 @@
import com.yeshi.fanli.entity.integral.IntegralExchange;
import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.exception.integral.IntegralExchangeException;
import com.yeshi.fanli.log.LogHelper;
@@ -159,13 +160,20 @@
if (ExchangeTypeEnum.freeCouponBuy == type) {
exchangeTip.setTip("鑷喘鍏嶅崟鍒镐粎鑳借嚜宸变娇鐢紝涓旀瘡涓敤鎴稩D鍙兘鍏戞崲涓�娆°�俓r\n娉�:鍏戞崲鎴愬姛鍚庤鍒扳�滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅");
} else if (ExchangeTypeEnum.freeCouponGive == type) {
- exchangeTip.setTip("璧犻�佸厤鍗曞埜鍏戞崲娆℃暟涓嶉檺锛岃禒閫佹鏁颁笉闄愶紝鍙楄禒浜鸿嫢鏃犫�滈個璇蜂汉鈥濇垚鍔熼鍙栧悗灏嗘垚涓轰綘鐨勪竴绾ч槦鍛樸�俓r\n娉�:鍏戞崲鎴愬姛鍚庤鍒扳�滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅");
+ exchangeTip.setTip("璧犻�佸厤鍗曞埜鍏戞崲娆℃暟涓嶉檺锛岃禒閫佹鏁颁笉闄愶紝鍙楄禒浜鸿嫢鏃犫�滈個璇蜂汉鈥濇垚鍔熼鍙栧悗灏嗘垚涓轰綘鐨勭洿鎺ョ矇涓濄�俓r\n娉�:鍏戞崲鎴愬姛鍚庤鍒扳�滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅");
} else if (ExchangeTypeEnum.rebatePercentCoupon == type) {
- exchangeTip.setTip("杩斿埄濂栧姳鍒稿厬鎹㈡鏁颁笉闄愶紝璧犻�佹鏁颁笉闄愶紝鍙楄禒浜鸿嫢鏃犫�滈個璇蜂汉鈥濇垚鍔熼鍙栧悗灏嗘垚涓轰綘鐨勪竴绾ч槦鍛樸�俓r\n娉�:鍏戞崲鎴愬姛鍚庤鍒扳�滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅");
+ exchangeTip.setTip("杩斿埄濂栧姳鍒稿厬鎹㈡鏁颁笉闄愶紝璧犻�佹鏁颁笉闄愶紝鍙楄禒浜鸿嫢鏃犫�滈個璇蜂汉鈥濇垚鍔熼鍙栧悗灏嗘垚涓轰綘鐨勭洿鎺ョ矇涓濄�俓r\n娉�:鍏戞崲鎴愬姛鍚庤鍒扳�滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅");
} else if (ExchangeTypeEnum.inviteCodePublish == type) {
if (codePublishRecordService.countValidRecord(uid) > 0)
throw new IntegralExchangeException(1, "涓夊ぉ涔嬪唴涓嶅彲閲嶅鍏戞崲");
- exchangeTip.setInviteCode(extraVO.getInviteCode());
+
+ String inviteCode = null;
+ if (!StringUtil.isNullOrEmpty(extraVO.getInviteCodeVip())) {
+ inviteCode = extraVO.getInviteCodeVip();
+ } else {
+ inviteCode = extraVO.getInviteCode();
+ }
+ exchangeTip.setInviteCode(inviteCode);
exchangeTip.setTip("鍏戞崲鎴愬姛鍚庯紝灏嗗彂甯冧簬鈥滄縺娲婚個璇风爜鍏戞崲鍔熻兘涓�濓紝闇�婵�娲婚個璇风殑鐢ㄦ埛鍙敤閲戝竵鍏戞崲锛屾湰娆″睍绀烘湁鏁堟湡涓�3澶┿��");
} else if (ExchangeTypeEnum.taoLiJin == type) {
exchangeTip.setName(exchange.getAmount().setScale(0) + "鍏冩帹骞跨孩鍖�");
@@ -252,7 +260,7 @@
} else if (ExchangeTypeEnum.rebatePercentCoupon == type) {
thing = "杩斿埄濂栧姳鍒�";
thingNum = "1寮�";
- String percent = configService.get("exchange_rebate_percent");
+ String percent = configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey());
userSystemCouponService.exchangeCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
UserSystemCoupon.SOURCE_EXCHANGE, new BigDecimal(percent));
couponNews = 1;
@@ -266,9 +274,7 @@
exchange.setNeedJump(true);
exchange.setBtnName("鍘绘煡鐪�");
} else if (ExchangeTypeEnum.taoLiJin == type) {
- thing = "鎺ㄥ箍绾㈠寘";
- thingNum = exchange.getAmount() + "鍏�";
- userTaoLiJinOriginService.exchangeMoney(uid, exchange.getAmount());
+ throw new IntegralExchangeException(1, "鎺ㄥ箍绾㈠寘鐩稿叧鍔熻兘宸蹭笅绾匡紒");
} else if (ExchangeTypeEnum.cash == type) {
thing = "鐜伴噾绾㈠寘";
BigDecimal money = exchange.getAmount();
--
Gitblit v1.8.0