From 469bba3a544b3beef0c170f6fce5804c9e8a9676 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 10 四月 2020 17:02:51 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 139 ++++++++++++++++++++++++++++------------------
1 files changed, 85 insertions(+), 54 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 d928082..321044f 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
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dto.push.PushContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgExtra;
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;
@@ -20,6 +21,7 @@
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.service.inter.money.msg.MsgMoneyDetailService;
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.msg.MsgExtraService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.msg.MsgMoneyDetailFactory;
@@ -31,35 +33,32 @@
private MsgMoneyDetailService msgMoneyDetailService;
@Resource
private PushService pushService;
+
+ @Resource
+ private MsgExtraService msgExtraService;
@Override
public void extractApplay(Extract extract) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractApplyMsg(extract, extract.getUserInfo().getId(),
- null);
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("浜哄伐瀹℃牳涓�", extract.getUserInfo().getId(),
+ extract, null, null);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
}
- @Async
- @Override
- public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractAutoMsg(extractRecord, stateDesc, desc, beiZhu);
- try {
- msgMoneyDetailService.addMsgMoneyDetail(detail);
- } catch (MsgMoneyDetailException e) {
- e.printStackTrace();
- }
- }
@Override
- public void extractFail(Extract extract, String stateDesc) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractFailMsg(extract, extract.getUserInfo().getId(),
- stateDesc);
+ public void extractFail(Extract extract, String reason) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇澶辫触", extract.getUserInfo().getId(),
+ extract, reason, null);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -76,11 +75,13 @@
}
@Override
- public void extractSuccess(Extract extract) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractSuccessMsg(extract, extract.getUserInfo().getId(),
- null);
+ public void extractSuccess(Extract extract, String alipayNo) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇鎴愬姛", extract.getUserInfo().getId(),
+ extract, null, alipayNo);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -96,11 +97,13 @@
}
@Override
- public void alipayAccountValid(AlipayAccountValidNormalHistory history) {
+ public void alipayAccountValid(AlipayAccountValidNormalHistory history, int limitDay, boolean change) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(),
- Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), null);
+ Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), limitDay, change);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -115,13 +118,30 @@
}
}
+
@Override
- 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, "鑻ラ渶鍐嶈繑璇蜂娇鐢ㄨ繑鍒╁鍔卞埜");
+ public void alipayAccountValidFail(AlipayAccountValidNormalHistory history, int limitDay, boolean change) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidFail(history, history.getUid(),
+ Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), limitDay, change);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
+ } catch (MsgMoneyDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ @Override
+ public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
+ BigDecimal balance, Date downTime) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
+ uid, Constant.TYPE_REBATE, downTime, false);
+ try {
+ msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -137,11 +157,14 @@
}
@Override
- public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createFailiWeiQuanMsg(uid, orderId, orderType, money, balance,
- null);
+ public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal fanliMoney,
+ int goodsCount, Date downTime) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderWeiQuanMsg(uid, orderId, orderType, money, fanliMoney,
+ goodsCount, downTime, Constant.TYPE_REBATE);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -159,14 +182,17 @@
@Override
public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
- BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createShareMsg(money, balance, orderType, orderCount, goodsCount,
- uid, null);
+ BigDecimal balance, String orderId, Date downTime) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
+ uid, Constant.TYPE_SHAER, downTime, false);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
+
PushContentDTO dto = PushMsgFactory.createMoneyShareRecieved(orderType, money);
try {
pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
@@ -178,11 +204,14 @@
}
@Override
- public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createShareWeiQuanMsg(uid, orderId, orderType, money, balance,
- null);
+ public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal fanliMoney,
+ int goodsCount, Date downTime) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderWeiQuanMsg(uid, orderId, orderType, money, fanliMoney,
+ goodsCount, downTime, Constant.TYPE_SHAER);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -195,30 +224,31 @@
} catch (PushException e) {
e.printStackTrace();
}
-
}
@Override
public void inviteOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteMsg(money, balance, orderType, orderCount, goodsCount,
- uid, null);
- try {
- msgMoneyDetailService.addMsgMoneyDetail(detail);
- } catch (MsgMoneyDetailException e) {
- e.printStackTrace();
- }
-
- PushContentDTO dto = PushMsgFactory.createMoneyInviteRecieved(orderType, money);
- try {
- pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (PushException e) {
- e.printStackTrace();
- }
+// MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteReceivedMsg(money, balance, orderType, orderCount, goodsCount,
+// uid, null);
+// try {
+// msgMoneyDetailService.addMsgMoneyDetail(detail);
+// } catch (MsgMoneyDetailException e) {
+// e.printStackTrace();
+// }
+//
+// PushContentDTO dto = PushMsgFactory.createMoneyInviteRecieved(orderType, money);
+// try {
+// pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
+// } catch (NumberFormatException e) {
+// e.printStackTrace();
+// } catch (PushException e) {
+// e.printStackTrace();
+// }
}
+
+
@Override
public void inviteOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteWeiQuanMsg(uid, orderId, orderType, money, balance,
@@ -328,15 +358,16 @@
}
@Override
- public void orderTeamReward(Long uid, Date date, String from, BigDecimal money, BigDecimal balance) {
-
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderTeamRewardMsg(uid, date, from, money, balance, null);
+ public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
-
}
+
}
--
Gitblit v1.8.0