From 6ec3ab1f28bf6bc98821b5f133f41af1ef1dcf3a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 27 六月 2019 14:44:59 +0800
Subject: [PATCH] 淘礼金创建区分：自购、分享
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
index 7a26ae9..a2aa6ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -264,17 +264,21 @@
record.setRightsId(taoLiJinDTO.getRightsId());
record.setSendUrl(taoLiJinDTO.getSendUrl());
record.setCreateTime(new Date());
+ if (origin == 1) { // 鑷喘
+ record.setUseType(1);
+ } else { // 鍒嗕韩
+ record.setUseType(2);
+ }
+
userTaoLiJinRecordMapper.insertSelective(record);
+ BigDecimal surplusTlj = MoneyBigDecimalUtil.sub(tlj, totalMoney);
UserMoneyExtra updateExtra = new UserMoneyExtra();
updateExtra.setUid(uid);
if (origin == 1) { // 鍓╀綑娣樼ぜ閲�-- 鑷喘
updateExtra.setTljSelf(MoneyBigDecimalUtil.sub(userMoneyExtra.getTljSelf(), totalMoney));
}
-
- // 鍓╀綑娣樼ぜ閲�
- BigDecimal surplusTlj = MoneyBigDecimalUtil.sub(tlj, totalMoney);
updateExtra.setTlj(surplusTlj);
updateExtra.setUpdateTime(new Date());
userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);
@@ -332,6 +336,19 @@
LogHelper.errorDetailInfo(e);
}
+ // 鍒涘缓鎶ュ憡
+ try {
+ userTaoLiJinReportService.insertDefault(rightsId);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
+
+ if (origin == 1) {
+ return; // 鑷喘涓嶆帹閫佹秷鎭�
+ }
+
+
// 浣跨敤鎴愬姛娑堟伅
try {
String beizhu = "鏈棰嗗彇/浣跨敤鐨勯儴鍒嗗皢浼氶��鍥�";
@@ -344,13 +361,6 @@
content.setMoney(totalMoney);
userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
-
- // 鍒涘缓鎶ュ憡
- try {
- userTaoLiJinReportService.insertDefault(rightsId);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
--
Gitblit v1.8.0