From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 0f22102..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
@@ -78,7 +78,7 @@
} else {
detail.setId(old.getId());
detail.setUpdateTime(new Date());
- vipShopOrderDetailMapper.insertSelective(detail);
+ vipShopOrderDetailMapper.updateByPrimaryKey(detail);
detailId = detail.getId();
}
@@ -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