From 6f87d14a23a0d054d528209b9ac035dcdb947cc4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 01 四月 2019 11:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 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..53f37f3 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,11 +35,12 @@
 			int orderState) {
 		MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,
 				null);
-		try {
-			msgOrderDetailService.updateMsgOrderDetail(detail);
-		} catch (MsgOrderDetailException e) {
-			e.printStackTrace();
-		}
+//鏆傛椂涓嶆帹閫�
+//		try {
+//			msgOrderDetailService.updateMsgOrderDetail(detail);
+//		} catch (MsgOrderDetailException e) {
+//			e.printStackTrace();
+//		}
 
 	}
 
@@ -61,11 +62,12 @@
 			int orderState) {
 		MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,
 				null);
-		try {
-			msgOrderDetailService.updateMsgOrderDetail(detail);
-		} catch (MsgOrderDetailException e) {
-			e.printStackTrace();
-		}
+//鏆傛椂涓嶆帹閫�
+//		try {
+//			msgOrderDetailService.updateMsgOrderDetail(detail);
+//		} catch (MsgOrderDetailException e) {
+//			e.printStackTrace();
+//		}
 
 	}
 
@@ -86,11 +88,12 @@
 			int orderState) {
 		MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
 				null);
-		try {
-			msgOrderDetailService.updateMsgOrderDetail(detail);
-		} catch (MsgOrderDetailException e) {
-			e.printStackTrace();
-		}
+//鏆傛椂涓嶆帹閫�
+//		try {
+//			msgOrderDetailService.updateMsgOrderDetail(detail);
+//		} catch (MsgOrderDetailException e) {
+//			e.printStackTrace();
+//		}
 
 	}
 

--
Gitblit v1.8.0