From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 489f304..7487ec6 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
@@ -38,8 +38,9 @@
}
try {
- pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
- Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
+ 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();
}
@@ -79,11 +80,11 @@
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();
+// }
}
@@ -106,11 +107,11 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(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();
+// }
}
@@ -140,11 +141,11 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(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
--
Gitblit v1.8.0