From 39c683421f75449c7a85280fa499bae3a2f5241b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 09:27:49 +0800
Subject: [PATCH] 金币领取
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 166 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 99 insertions(+), 67 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 a20b087..3401e05 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
@@ -7,13 +7,14 @@
import org.springframework.stereotype.Service;
+import com.yeshi.fanli.dto.push.PushContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+import com.yeshi.fanli.entity.config.push.PushMsgFactory;
import com.yeshi.fanli.exception.PushException;
import com.yeshi.fanli.exception.msg.MsgOrderDetailException;
import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.push.PushService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;
@Service
@@ -26,10 +27,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);
@@ -37,81 +38,102 @@
e.printStackTrace();
}
+ if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) {
+ PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(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 orderFanLiStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+ int orderState) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, orderType, 0, orderState, payMoney,
+ money, null);
+ // 鏆傛椂涓嶆帹閫�
try {
- if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)
- pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
- Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ 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);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+
+ PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(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 orderFanLiStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
- // 鏆傛椂涓嶆帹閫�
- try {
- msgOrderDetailService.updateMsgOrderDetail(detail, false);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
}
@Override
- public void orderShareStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
+ public void orderShareStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, goodsCount, orderState, payMoney,
+ MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, 0, orderState, payMoney,
money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail,
- (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
-
- }
-
- @Override
- public void orderShareStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 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);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
+
+ PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(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 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,29 +145,39 @@
}
@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);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
+
+ PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(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 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