From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 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..c7bbf51 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
@@ -11,8 +11,10 @@
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.order.ESOrder;
 import com.yeshi.fanli.entity.pdd.PDDOrder;
+import com.yeshi.fanli.entity.suning.SuningOrderInfo;
 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;
@@ -20,6 +22,7 @@
 import net.sf.json.JSONObject;
 
 public interface CommonOrderService {
+	
 
 	public int insert(CommonOrder record);
 
@@ -173,6 +176,36 @@
 	 * @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;
+	
+	
+	
+	/**
+	 * 娣诲姞鑻忓畞璁㈠崟
+	 * @Title: addVipShopOrder
+	 * @Description: 
+	 * @param order
+	 * @param uid
+	 * @return
+	 * @throws CommonOrderException 
+	 * List<CommonOrderAddResultDTO> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<CommonOrderAddResultDTO> addSuningOrder(List<SuningOrderInfo> suningOrderList, Long uid) throws CommonOrderException;
+
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
@@ -414,7 +447,7 @@
 			List<Integer> listSource) throws CommonOrderException, Exception;
 
 	long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
-			String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException;
+			String endTime, Integer dateType, List<Integer> listSource);
 
 	/**
 	 * 缁存潈閲戦璁$畻
@@ -440,4 +473,11 @@
 	 */
 	public String getNewestOrderNoByTaoBao();
 
+	/**
+	 * 鏍规嵁璁㈠崟鍙锋煡璇�
+	 * @param orderNo
+	 * @return
+	 */
+	public List<CommonOrder> listByOrderNo(String orderNo);
+
 }

--
Gitblit v1.8.0