From b8b373ab3ba3e8cadc241cce78ecca9594bdc68f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 11:30:12 +0800
Subject: [PATCH] 消息订单搜索框订单号显示规则更改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 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 0599cdd..3e81ef9 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
@@ -114,7 +114,7 @@
 	 * @return
 	 */
 	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
-			String endTime);
+			String endTime, Integer source);
 
 	/**
 	 * 鏍规嵁鏉′欢缁熻
@@ -219,10 +219,10 @@
 	 */
 
 	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
-			Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException;
+			Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException;
 
 	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
-			String startTime, String endTime) throws CommonOrderException;
+			String startTime, String endTime, Integer source) throws CommonOrderException;
 
 
 	/**
@@ -233,7 +233,7 @@
 	 * @return
 	 * @throws CommonOrderException
 	 */
-	public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
+	public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
 			throws CommonOrderException;
 
 	/**
@@ -253,4 +253,34 @@
 	 */
 	public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId);
 
+	/**
+	 * 鍒犻櫎閿欒璁㈠崟
+	 * 
+	 * @param coId
+	 */
+	public void deleteErrorCommonOrder(Long coId);
+
+	/**
+	 * 鏍规嵁璁㈠崟绫诲瀷涓庝氦鏄揑D鏌ヨ
+	 * 
+	 * @param sourceType
+	 * @param tradeId
+	 * @return
+	 */
+	public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId);
+
+	/**
+	 * 鏍规嵁鏉′欢鏌ヨ璁㈠崟
+	 * 
+	 * @param sourceType
+	 * @param state
+	 * @param minTime
+	 * @param maxTime
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+			Long maxTime, int page, int pageSize);
+
 }

--
Gitblit v1.8.0