From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +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/tlj/UserTaoLiJinOriginServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
index 23d9c0f..2c3ad2f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
@@ -148,7 +148,7 @@
if (uid == null) {
throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖");
}
- String value = configTaoLiJinService.getValueByKey("hongbao_newbies");
+ String value = configTaoLiJinService.getValueByKey("hongbao_newbies",null);
if (StringUtil.isNullOrEmpty(value)) {
throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�");
}
@@ -207,7 +207,7 @@
throw new UserTaoLiJinOriginException(2, "鐢ㄦ埛绛夌骇涓嶈冻");
}
- String value = configTaoLiJinService.getValueByKey(key);
+ String value = configTaoLiJinService.getValueByKey(key,null);
if (StringUtil.isNullOrEmpty(value)) {
throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�");
}
@@ -246,7 +246,7 @@
throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖");
}
- String value = configTaoLiJinService.getValueByKey("hongbao_invite");
+ String value = configTaoLiJinService.getValueByKey("hongbao_invite",null);
if (StringUtil.isNullOrEmpty(value)) {
throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�");
}
@@ -285,7 +285,7 @@
throw new UserTaoLiJinOriginException(1, "鐢ㄦ埛鏈櫥褰�");
}
- String value = configTaoLiJinService.getValueByKey("hongbao_share");
+ String value = configTaoLiJinService.getValueByKey("hongbao_share",null);
if (StringUtil.isNullOrEmpty(value)) {
throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�");
}
@@ -533,7 +533,7 @@
throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖");
}
- String value = configTaoLiJinService.getValueByKey("hongbao_invite");
+ String value = configTaoLiJinService.getValueByKey("hongbao_invite",null);
if (StringUtil.isNullOrEmpty(value)) {
throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�");
}
@@ -565,4 +565,18 @@
userTaoLiJinDetailService.insertSelective(detail);
}
+
+ @Override
+ @Transactional
+ public void exchangeMoney(Long uid, BigDecimal money) throws UserTaoLiJinOriginException{
+ if (uid == null || money == null) {
+ throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖");
+ }
+ // 娣诲姞鐢ㄦ埛绾㈠寘
+ userMoneyExtraService.addTaoLiJin(uid, money, false);
+ // 娣诲姞鏂板璁板綍
+ UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.exchange);
+ // 绾㈠寘鏄庣粏
+ userTaoLiJinDetailService.createAddDetail(origin);
+ }
}
--
Gitblit v1.8.0