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/inter/order/CommonOrderService.java | 122 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 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 4bfb157..2419668 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,7 +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;
@@ -19,6 +22,7 @@
import net.sf.json.JSONObject;
public interface CommonOrderService {
+
public int insert(CommonOrder record);
@@ -172,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锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
@@ -372,8 +406,94 @@
* @param list
* @return
*/
- public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception;
+ public List<CommonOrderVO> searchOrderByUid(AcceptData acceptData, int page, int size, Long uid, List<ESOrder> list) throws Exception;
public long countSearchOrderByUid(Long uid, List<ESOrder> list);
+
+ /**
+ * 杩斿洖璁㈠崟鐨勭涓夋柟鍒涘缓鏃堕棿
+ * @Title: getThirdCreateTime
+ * @Description:
+ * @param orderId
+ * @param sourceType
+ * @return
+ * Date 杩斿洖绫诲瀷
+ * @throws
+ */
+ public Date getThirdCreateTime(String orderId,int sourceType);
+
+
+ public List<CommonOrder> getMinSettleTimeAndUid();
+
+ /**
+ * 鏂扮増绾㈠寘淇℃伅2.1
+ * @param acceptData
+ * @param page
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param orderNo
+ * @param startTime
+ * @param endTime
+ * @param dateType
+ * @param listSource
+ * @return
+ * @throws CommonOrderException
+ * @throws Exception
+ */
+ 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) throws CommonOrderException, Exception;
+
+ long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
+ String endTime, Integer dateType, List<Integer> listSource);
+
+ /**
+ * 缁存潈閲戦璁＄畻
+ * @param listWQ
+ * @param sourceType
+ * @param uid
+ * @return
+ */
+ public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid);
+
+
+ /**
+ * 缁熻璁㈠崟璁板綍鏁伴噺-闈炶鍗曞彿涓轰富
+ * @param uid
+ * @param payment
+ * @return
+ */
+ public long countOrderByUidAndSettled(Long uid, BigDecimal payment);
+
+ /**
+ * 鑾峰彇鏈�鏂扮殑娣樺疂璁㈠崟鍙�
+ * @return
+ */
+ public String getNewestOrderNoByTaoBao();
+
+ /**
+ * 鏍规嵁璁㈠崟鍙锋煡璇�
+ * @param orderNo
+ * @return
+ */
+ public List<CommonOrder> listByOrderNo(String orderNo);
+
+ /**
+ * 鏍规嵁璁㈠崟绫诲瀷+ 璁㈠崟鍙锋煡璇�
+ * @param uid
+ * @param orderNO
+ * @param sourceType
+ * @return
+ */
+ public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType);
+
+ /**
+ * 棣栧崟
+ * @param uid
+ * @return
+ */
+ public CommonOrder getFirstOrder(Long uid);
}
--
Gitblit v1.8.0