From 58ee87fd64efdb75d16e396c3d952d3522c3a747 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 17:54:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index baa0a3b..0572dd7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -238,11 +238,11 @@
 				update.setId(lo.getId());
 				update.setResultCode(LostOrder.RESULT_CODE_SUCCESS);
 				lostOrderMapper.updateByPrimaryKeySelective(update);
-				Order order = orderService.findOrderByOrderIdAndType(orderId, Order.ORDER_TYPE_TAOBAO);
+				Order order = orderService.findOrderByOrderIdAndType(orderId, orderType);
 				if (order != null)
 					// 娣诲姞閫氱煡
 					userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), lo.getOrderId(),
-							order.getMoney(), 1, new Date(lo.getHandleTime()));
+							order.getMoney(), orderType, new Date(lo.getHandleTime()));
 			}
 		}
 	}

--
Gitblit v1.8.0