From 616608ec1005bff373bc380ecc3bf02a1063497c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 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 2c3ad2f..5b1d3dc 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
@@ -399,8 +399,6 @@
});
}
-
-
@Override
public void overdueHongBao(Long uid) {
@@ -579,4 +577,61 @@
// 绾㈠寘鏄庣粏
userTaoLiJinDetailService.createAddDetail(origin);
}
+
+
+ @Override
+ @Transactional
+ public UserTaoLiJinOrigin receiveFriendsGive(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.friendsGive);
+ // 绾㈠寘鏄庣粏
+ userTaoLiJinDetailService.createAddDetail(origin);
+ // 娑堟伅
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
+ content.setState("绾㈠寘澧炲姞");
+ content.setSource("濂藉弸璧犻��");
+ content.setMoney(money);
+ userOtherMsgNotificationService.taoLiJinMsg(uid, "", content);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ });
+ return origin;
+ }
+
+
+
+ @Override
+ @Transactional
+ public void giveSendBack(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.giveSendBack);
+ // 绾㈠寘鏄庣粏
+ userTaoLiJinDetailService.createAddDetail(origin);
+ UserTaoLiJinDetail detail = new UserTaoLiJinDetail();
+ detail.setUid(uid);
+ detail.setMoney(money);
+ detail.setType(TaoLiJinDetailTypeEnum.giveBack);
+ detail.setTitle(TaoLiJinDetailTypeEnum.giveBack.getDesc());
+ detail.setCreateTime(new Date());
+ userTaoLiJinDetailService.insertSelective(detail);
+ }
+
}
--
Gitblit v1.8.0