From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
index ee50596..3b8be1c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.config.push.PushMsgFactory;
import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;
import com.yeshi.fanli.exception.push.PushException;
@@ -118,7 +119,7 @@
public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
BigDecimal balance) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createFailiMsg(money, balance, orderId, orderType, goodsCount,
- uid, null);
+ uid, "鑻ラ渶鍐嶈繑璇蜂娇鐢ㄨ繑鍒╁鍔卞埜");
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
@@ -295,11 +296,29 @@
e.printStackTrace();
}
}
+
+ @Override
+ public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type,BigDecimal money, String stateDesc,
+ String content) {
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setRead(false);
+ detail.setMoney(money);
+ detail.setMsgType(type);
+ detail.setContent(content);
+ detail.setStateDesc(stateDesc);
+ detail.setUser(new UserInfo(uid));
+ detail.setBeiZhu("绯荤粺宸蹭笅鍙戝埌鈥滄垜鐨�-绾㈠寘鈥濅腑");
+ detail.setCreateTime(new Date());
+ try {
+ msgMoneyDetailService.addMsgMoneyDetail(detail);
+ } catch (MsgMoneyDetailException e) {
+ e.printStackTrace();
+ }
+ }
@Override
public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteOrderSubSidyMsg(uid, date, from, money, balance,
- null);
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteOrderSubSidyMsg(uid, date, from, money, balance, null);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
--
Gitblit v1.8.0