From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index f831d48..8f7cb69 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -13,6 +13,7 @@
 import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.entity.vipshop.VipShopOrder;
 import com.yeshi.fanli.exception.order.CommonOrderException;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
 import com.yeshi.fanli.vo.order.OrderCountVO;
@@ -173,6 +174,20 @@
 	 * @throws CommonOrderException
 	 */
 	public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException;
+	
+	
+	/**
+	 * 娣诲姞鍞搧浼氳鍗�
+	 * @Title: addVipShopOrder
+	 * @Description: 
+	 * @param order
+	 * @param uid
+	 * @return
+	 * @throws CommonOrderException 
+	 * List<CommonOrderAddResultDTO> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<CommonOrderAddResultDTO> addVipShopOrder(VipShopOrder order, Long uid) throws CommonOrderException;
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
@@ -440,4 +455,11 @@
 	 */
 	public String getNewestOrderNoByTaoBao();
 
+	/**
+	 * 鏍规嵁璁㈠崟鍙锋煡璇�
+	 * @param orderNo
+	 * @return
+	 */
+	public List<CommonOrder> listByOrderNo(String orderNo);
+
 }

--
Gitblit v1.8.0