From 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 28 二月 2020 15:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 b3c1d17..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
@@ -10,9 +10,11 @@
import com.yeshi.fanli.dto.push.PushContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
+import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
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;
@@ -51,7 +53,7 @@
e.printStackTrace();
}
}
-
+
@Override
public void extractFail(Extract extract, String stateDesc) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractFailMsg(extract, extract.getUserInfo().getId(),
@@ -117,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) {
@@ -275,4 +277,53 @@
}
}
+ @Override
+ public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createElmeFanliMsg(uid, orderId, money, balance, null);
+ try {
+ msgMoneyDetailService.addMsgMoneyDetail(detail);
+ } catch (MsgMoneyDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createRedPackMsg(uid, type, content, beiZhu);
+ try {
+ msgMoneyDetailService.addMsgMoneyDetail(detail);
+ } catch (MsgMoneyDetailException e) {
+ 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);
+ try {
+ msgMoneyDetailService.addMsgMoneyDetail(detail);
+ } catch (MsgMoneyDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0