From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 9b08ba6..088f192 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
@@ -35,8 +35,9 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -61,8 +62,9 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -86,8 +88,9 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0