From 8c04d27e5cebb7e654c208533e9567c4df2c8acc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:21:44 +0800
Subject: [PATCH] 券时间限制
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..3c18571 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
@@ -165,7 +165,14 @@
} 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) + "鍏冩帹骞跨孩鍖�");
@@ -266,9 +273,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