From 2366d2ada9e67f915a06b51b3c5be08a00847f0c Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 10:47:06 +0800
Subject: [PATCH] 用户邀请码激活

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   79 ++++++++++++++++++++++++++++++---------
 1 files changed, 60 insertions(+), 19 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 87f1f97..474cbb0 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
@@ -5,8 +5,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.exception.order.CommonOrderException;
@@ -82,7 +80,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day);
+	public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day);
 
 	/**
 	 * 缁熻璁㈠崟
@@ -90,7 +88,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public long countOrder(Long uid, Integer type, Integer isToday);
+	public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime);
 
 	/**
 	 * 缁熻璁㈠崟
@@ -98,8 +96,21 @@
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal countOrderMoney(Long uid, Integer type, Integer isToday);
+	public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime);
 
+	/**
+	 * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰�
+	 * @param uid
+	 * @param type
+	 * @param day
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
+			String endTime);
+
+	
 	/**
 	 * 鏍规嵁鏉′欢缁熻
 	 * 
@@ -130,19 +141,6 @@
 	 */
 	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
 
-	/**
-	 * 鏍规嵁鎻愭潯浠剁粺璁″凡鍒拌处閲戦
-	 * 
-	 * @param uid
-	 * @param type
-	 * @param orderNo
-	 * @param startTime
-	 * @param endTime
-	 * @param day
-	 * @return
-	 */
-	public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,
-			String endTime, Integer day);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
@@ -152,6 +150,49 @@
 	 * @param maxDate
 	 * @return
 	 */
-	long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
+	public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
+
+	/**
+	 * 鍚庣鏌ヨ璁㈠崟鍒楄〃
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param orderNo
+	 * @param startTime
+	 * @param endTime
+	 * @param dateType 1鏄ㄥぉ  2浠婂ぉ 3鏈湀 4 涓婃湀
+	 * @return
+	 * @throws CommonOrderException
+	 */
+	public List<CommonOrderVO> listQueryByUid(long start, int count, 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
+	 * @param key
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param startTime
+	 * @param endTime
+	 * @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;
 
 }

--
Gitblit v1.8.0