From 7a29e50e7e2eefe6c0e6e1deb53690147184e078 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 29 八月 2019 18:00:12 +0800
Subject: [PATCH] 队员首单 奖励上级金币
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 72fc286..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
@@ -435,7 +435,7 @@
BigDecimal total = new BigDecimal(0);
for (UserTaoLiJinOrigin userTaoLiJinOrigin : list) {
- SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
String time = sd.format(userTaoLiJinOrigin.getCreateTime());
BigDecimal moneySurplus = userTaoLiJinOrigin.getMoneySurplus();
@@ -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);
@@ -643,11 +642,11 @@
public void run() {
// 閫�鍥炴秷鎭�
String beiZhu = "璇峰埌鎴戠殑-鎺ㄥ箍绾㈠寘鏌ョ湅";
- SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");
+ 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