From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +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/msg/UserOrderMsgNotificationServiceImpl.java | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
index 7487ec6..207ad92 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
@@ -26,10 +26,10 @@
private PushService pushService;
@Override
- public void orderFanLiStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, goodsCount, orderState, payMoney,
- money, null);
+ public void orderFanLiStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+ int goodsCount, int orderState) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, orderType, goodsCount, orderState,
+ payMoney, money, null);
try {
msgOrderDetailService.addMsgOrderDetail(detail,
(payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
@@ -47,10 +47,10 @@
}
@Override
- public void orderFanLiStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
+ public void orderFanLiStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, orderType, 0, orderState, payMoney,
+ money, null);
// 鏆傛椂涓嶆帹閫�
try {
msgOrderDetailService.updateMsgOrderDetail(detail, false);
@@ -61,10 +61,10 @@
}
@Override
- public void orderShareStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, goodsCount, orderState, payMoney,
- money, null);
+ public void orderShareStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+ int goodsCount, int orderState) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, goodsCount, orderState,
+ payMoney, money, null);
try {
msgOrderDetailService.addMsgOrderDetail(detail,
(payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
@@ -75,24 +75,24 @@
}
@Override
- public void orderShareStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
+ public void orderShareStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
+ MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, 0, orderState, payMoney,
+ money, null);
// 鏆傛椂涓嶆帹閫�
-// try {
-// msgOrderDetailService.updateMsgOrderDetail(detail, false);
-// } catch (MsgOrderDetailException e) {
-// e.printStackTrace();
-// }
+ // try {
+ // msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ // } catch (MsgOrderDetailException e) {
+ // e.printStackTrace();
+ // }
}
@Override
- public void orderInviteStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
- money, null);
+ public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+ int goodsCount, int orderState) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, goodsCount, orderState,
+ payMoney, money, null);
try {
msgOrderDetailService.addMsgOrderDetail(detail,
(money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
@@ -102,16 +102,16 @@
}
@Override
- public void orderInviteStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
+ public void orderInviteStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
+ MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, 0, orderState,
+ payMoney, money, null);
// 鏆傛椂涓嶆帹閫�
-// try {
-// msgOrderDetailService.updateMsgOrderDetail(detail, false);
-// } catch (MsgOrderDetailException e) {
-// e.printStackTrace();
-// }
+ // try {
+ // msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ // } catch (MsgOrderDetailException e) {
+ // e.printStackTrace();
+ // }
}
@@ -123,10 +123,10 @@
}
@Override
- public void orderShareFirstLevelStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
- int goodsCount, int orderState, String sourceUserName) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
- money, String.format("鐢变竴绾ч槦鍛樸��%s銆戝垎浜�", getShortName(sourceUserName)));
+ public void orderShareFirstLevelStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney,
+ BigDecimal money, int goodsCount, int orderState, String sourceUserName) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, goodsCount, orderState,
+ payMoney, money, String.format("鐢变竴绾ч槦鍛樸��%s銆戝垎浜�", getShortName(sourceUserName)));
try {
msgOrderDetailService.addMsgOrderDetail(detail,
(money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
@@ -136,16 +136,16 @@
}
@Override
- public void orderShareFirstLevelStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
+ public void orderShareFirstLevelStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney,
+ BigDecimal money, int orderState) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, 0, orderState,
+ payMoney, money, null);
// 鏆傛椂涓嶆帹閫�
-// try {
-// msgOrderDetailService.updateMsgOrderDetail(detail, false);
-// } catch (MsgOrderDetailException e) {
-// e.printStackTrace();
-// }
+ // try {
+ // msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ // } catch (MsgOrderDetailException e) {
+ // e.printStackTrace();
+ // }
}
@Override
--
Gitblit v1.8.0