From a69ec998d9fe8fa8ea6c40175bebc4e53a227d5b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 11 六月 2020 09:26:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java
index bfe40b0..c365a3c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java
@@ -127,6 +127,17 @@
 	}
 
 	@Override
+	public List<VipShopOrder> listDetailByOrderSn(String orderSn) {
+		List<VipShopOrder> list = new ArrayList<>();
+		VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
+		if (order == null)
+			return null;
+		order = selectDetailByPrimaryKey(order.getId());
+		list.add(order);
+		return list;
+	}
+
+	@Override
 	public VipShopOrder selectDetailByPrimaryKey(Long orderId) {
 		VipShopOrder order = vipShopOrderMapper.selectByPrimaryKey(orderId);
 		if (order == null)

--
Gitblit v1.8.0