From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 f50642e..c4b87c1 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
@@ -25,7 +25,9 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, goodsCount, orderState, payMoney,
money, null);
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -51,7 +53,8 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, goodsCount, orderState, payMoney,
money, null);
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -78,7 +81,8 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
money, null);
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -111,7 +115,8 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
money, String.format("鐢变竴绾ч槦鍛樸��%s銆戝垎浜�", getShortName(sourceUserName)));
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -128,28 +133,25 @@
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
-
}
@Override
- public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType,
- Date happendDate) {
+ public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate) {
MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, true, payMoney, orderType,
happendDate, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail, true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
}
@Override
- public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType,
- Date happendDate) {
+ public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate) {
MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, false, payMoney, orderType,
happendDate, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail, true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0