From f94a5a1d3fe9bde0e599d41f2d97caea1b08a88d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 15:48:12 +0800
Subject: [PATCH] 免单调整
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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 5b4aa63..005024e 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锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
@@ -411,10 +444,10 @@
*/
public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
- List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception;
+ 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, boolean notBackSuVip) throws CommonOrderException;
+ String endTime, Integer dateType, List<Integer> listSource);
/**
* 缁存潈閲戦璁＄畻
@@ -447,4 +480,13 @@
*/
public List<CommonOrder> listByOrderNo(String orderNo);
+ /**
+ * 鏍规嵁璁㈠崟绫诲瀷+ 璁㈠崟鍙锋煡璇�
+ * @param uid
+ * @param orderNO
+ * @param sourceType
+ * @return
+ */
+ public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType);
+
}
--
Gitblit v1.8.0