From 8e30aa7c1f0384f09278699318b4902b815b42a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2019 18:01:25 +0800
Subject: [PATCH] 维权返利初步修改，拼多多初步增加

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 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 b4cc256..0ad7a3d 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
@@ -102,6 +102,7 @@
 
 	/**
 	 * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰�
+	 * 
 	 * @param uid
 	 * @param type
 	 * @param day
@@ -112,7 +113,6 @@
 	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
 			String endTime);
 
-	
 	/**
 	 * 鏍规嵁鏉′欢缁熻
 	 * 
@@ -143,9 +143,9 @@
 	 */
 	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
 
-
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
+	 * 
 	 * @param uid
 	 * @param state
 	 * @param minDate
@@ -156,6 +156,7 @@
 
 	/**
 	 * 鍚庣鏌ヨ璁㈠崟鍒楄〃
+	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
@@ -165,7 +166,8 @@
 	 * @param orderNo
 	 * @param startTime
 	 * @param endTime
-	 * @param dateType 1鏄ㄥぉ  2浠婂ぉ 3鏈湀 4 涓婃湀
+	 * @param dateType
+	 *            1鏄ㄥぉ 2浠婂ぉ 3鏈湀 4 涓婃湀
 	 * @return
 	 * @throws CommonOrderException
 	 */
@@ -173,11 +175,12 @@
 			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
 			throws CommonOrderException;
 
-	public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
-			String endTime, Integer dateType) throws CommonOrderException;
+	public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
+			String startTime, String endTime, Integer dateType) throws CommonOrderException;
 
 	/**
-	 * 鏌ヨ鎵�鏈夌敤鎴疯鍗� 
+	 * 鏌ヨ鎵�鏈夌敤鎴疯鍗�
+	 * 
 	 * @param start
 	 * @param count
 	 * @param keyType
@@ -190,15 +193,16 @@
 	 * @return
 	 * @throws CommonOrderException
 	 */
-	
-	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, Integer type,
-			Integer orderState, String startTime, String endTime) throws CommonOrderException;
 
-	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime,
-			String endTime) throws CommonOrderException;
+	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
+			Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException;
+
+	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+			String startTime, String endTime) throws CommonOrderException;
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙疯幏鍙栦俊鎭�
+	 * 
 	 * @param orderNo
 	 * @return
 	 * @throws CommonOrderException
@@ -207,28 +211,42 @@
 
 	/**
 	 * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+	 * 
 	 * @param uid
 	 * @param state
 	 * @param orderNo
 	 * @return
 	 * @throws CommonOrderException
 	 */
-	public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer state, String orderNo) throws CommonOrderException;
+	public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer state, String orderNo)
+			throws CommonOrderException;
 
 	/**
 	 * 鏌ヨ璁㈠崟
+	 * 
 	 * @param uid
 	 * @param orderNo
 	 * @return
 	 * @throws CommonOrderException
 	 */
-	public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) throws CommonOrderException;
+	public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
+			throws CommonOrderException;
 
 	/**
 	 * 浣跨敤濂栧姳鍒告垚鍔熷悗璺宠浆 淇敼
+	 * 
 	 * @param orderNo
 	 * @return
 	 */
 	public JSONObject getRewardJumpInfo(String orderNo);
 
+	/**
+	 * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�
+	 * 
+	 * @param sourceType
+	 * @param tradeId
+	 * @return
+	 */
+	public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId);
+
 }

--
Gitblit v1.8.0