From 9c9911225e32b308520afe3fe8bc20aa5ffa5094 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 29 八月 2019 15:55:23 +0800
Subject: [PATCH] 红包统计剔除 赠送退回统计

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 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 3cda868..3e43e73 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
@@ -626,9 +626,8 @@
 		// 娣诲姞绾㈠寘浣欓
 		userMoneyExtraService.addTaoLiJin(uid, money, false);
 		// 娣诲姞鏂板璁板綍
-		UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);
+		saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);
 		// 绾㈠寘鏄庣粏
-		userTaoLiJinDetailService.createAddDetail(origin);
 		UserTaoLiJinDetail detail = new UserTaoLiJinDetail();
 		detail.setUid(uid);
 		detail.setMoney(money);
@@ -647,7 +646,7 @@
 				MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();
 				msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);
 				msgOther.setTitle("鎺ㄥ箍绾㈠寘閫�鍥�");
-				msgOther.setGiveType("浣犺禒閫佺殑"+ money + "鎺ㄥ箍绾㈠寘鏈鎴愬姛棰嗗彇");
+				msgOther.setGiveType("浣犺禒閫佺殑"+ money.setScale(0) + "鍏冩帹骞跨孩鍖呮湭琚垚鍔熼鍙�");
 				msgOther.setGiveTime(sd.format(record.getGiveTime()));
 				msgOther.setReturnTime(sd.format(new Date()));
 				userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);

--
Gitblit v1.8.0