From b72be3656e4a381a60ada768a58fa8523719b10d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 19:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 89e088c..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);
@@ -646,8 +645,8 @@
SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();
msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);
- msgOther.setTitle("璧犻�佹帹骞跨孩鍖呴��鍥�");
- msgOther.setGiveType("浣犺禒閫佺殑"+ money + "鎺ㄥ箍绾㈠寘鏈鎴愬姛棰嗗彇");
+ msgOther.setTitle("鎺ㄥ箍绾㈠寘閫�鍥�");
+ 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