From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 142 ++++++++++-------------------------------------
1 files changed, 30 insertions(+), 112 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 76559b3..5772b95 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
@@ -5,16 +5,13 @@
import javax.annotation.Resource;
-import org.springframework.scheduling.annotation.Async;
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;
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;
@@ -43,8 +40,6 @@
extract, null, null);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -57,8 +52,6 @@
extract, reason, null);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -80,8 +73,6 @@
extract, null, alipayNo);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -99,11 +90,9 @@
@Override
public void alipayAccountValid(AlipayAccountValidNormalHistory history, String limitDay, boolean change) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(),
- Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), limitDay, change);
+ Constant.alipayConfig.getAccountName(), 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();
}
@@ -125,8 +114,6 @@
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();
}
@@ -136,12 +123,32 @@
@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);
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
+ uid, downTime, false);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
+ } catch (MsgMoneyDetailException e) {
+ e.printStackTrace();
+ }
+
+ PushContentDTO dto = PushMsgFactory.createMoneyFanliRecieved(orderType, orderId, money);
+ try {
+ pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ @Override
+ public void rewardCounponReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
+ BigDecimal balance, Date downTime) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
+ uid, downTime, true);
+ try {
+ msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -163,8 +170,6 @@
goodsCount, downTime, Constant.TYPE_REBATE);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -183,12 +188,9 @@
@Override
public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
BigDecimal balance, String orderId, Date downTime) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
- uid, Constant.TYPE_SHAER, downTime, false);
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.shareOrderReceivedMsg(money, balance, orderType, uid);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -210,8 +212,6 @@
goodsCount, downTime, Constant.TYPE_SHAER);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
@@ -225,19 +225,18 @@
e.printStackTrace();
}
}
+
@Override
- public void inviteOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
- BigDecimal balance) {
-// MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteReceivedMsg(money, balance, orderType, orderCount, goodsCount,
-// uid, null);
+ public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance) {
+// MsgMoneyDetail detail = MsgMoneyDetailFactory.createSystemEqualizeMsg(uid, reason, money, balance, null);
// try {
// msgMoneyDetailService.addMsgMoneyDetail(detail);
// } catch (MsgMoneyDetailException e) {
// e.printStackTrace();
// }
//
-// PushContentDTO dto = PushMsgFactory.createMoneyInviteRecieved(orderType, money);
+// PushContentDTO dto = PushMsgFactory.createMoneySystemCompensate(reason, money);
// try {
// pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
// } catch (NumberFormatException e) {
@@ -248,75 +247,6 @@
}
-
- @Override
- public void inviteOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteWeiQuanMsg(uid, orderId, orderType, money, balance,
- null);
- try {
- msgMoneyDetailService.addMsgMoneyDetail(detail);
- } catch (MsgMoneyDetailException e) {
- e.printStackTrace();
- }
- PushContentDTO dto = PushMsgFactory.createMoneyOrderShareOrInviteWeiquan(orderType, orderId, false, money);
- try {
- pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (PushException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void orderReward(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderRewardMsg(uid, orderId, orderType, money, balance,
- null);
- try {
- msgMoneyDetailService.addMsgMoneyDetail(detail);
- } catch (MsgMoneyDetailException e) {
- e.printStackTrace();
- }
-
- PushContentDTO dto = PushMsgFactory.createMoneySystemReward("浣跨敤杩斿埄濂栧姳鍒�", money);
- try {
- pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (PushException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createSystemEqualizeMsg(uid, reason, money, balance, null);
- try {
- msgMoneyDetailService.addMsgMoneyDetail(detail);
- } catch (MsgMoneyDetailException e) {
- e.printStackTrace();
- }
-
- PushContentDTO dto = PushMsgFactory.createMoneySystemCompensate(reason, money);
- try {
- pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (PushException e) {
- e.printStackTrace();
- }
- }
-
- @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);
@@ -346,24 +276,12 @@
}
}
- @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();
- }
- }
@Override
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