From 758a59e77aba29b858698808fedd31c569955357 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 五月 2020 15:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/vipshop/VipShopOrderService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/vipshop/VipShopOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/vipshop/VipShopOrderService.java
index 91bb49d..7c2c8b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/vipshop/VipShopOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/vipshop/VipShopOrderService.java
@@ -2,9 +2,8 @@
import java.util.List;
-import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.vipshop.VipShopOrder;
import com.yeshi.fanli.entity.vipshop.VipShopOrderDetail;
-import com.yeshi.fanli.exception.jd.JDOrderException;
import com.yeshi.fanli.exception.vipshop.VipShopOrderException;
public interface VipShopOrderService {
@@ -13,9 +12,9 @@
* 娣诲姞璁㈠崟
*
* @param order
- * @throws JDOrderException
+ * @throws VipShopOrderException
*/
- public void addVipShopOrder(JDOrder order) throws VipShopOrderException;
+ public void addOrder(VipShopOrder order) throws VipShopOrderException;
/**
* 鏍规嵁涓婚敭ID鏌ヨ
@@ -23,14 +22,22 @@
* @param orderId
* @return
*/
- public JDOrder selectByPrimaryKey(Long orderId);
+ public VipShopOrder selectByPrimaryKey(Long orderId);
+
+ /**
+ * 鏍规嵁璁㈠崟鍙锋煡璇�
+ *
+ * @param orderId
+ * @return
+ */
+ public List<VipShopOrder> listByOrderSn(String orderSn);
/**
* 鏍规嵁涓婚敭鏌ヨ(鍖呭惈瀛愯鍗�)
* @param orderId
* @return
*/
- public JDOrder selectDetailByPrimaryKey(Long orderId);
+ public VipShopOrder selectDetailByPrimaryKey(Long orderId);
public Long countOrderByDay(String preDay);
--
Gitblit v1.8.0