From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 17:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 207ad92..7ccd94a 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.exception.PushException;
+import com.yeshi.fanli.entity.config.push.PushMsgFactory;
import com.yeshi.fanli.exception.msg.MsgOrderDetailException;
+import com.yeshi.fanli.exception.push.PushException;
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
@@ -37,12 +38,15 @@
e.printStackTrace();
}
- try {
- if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)
- pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
- Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
- } catch (PushException e) {
- 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();
+ }
}
}
@@ -72,6 +76,15 @@
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
@@ -97,6 +110,15 @@
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();
}
}
@@ -133,6 +155,16 @@
} 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
--
Gitblit v1.8.0