From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 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 4f30693..c6ffbc8 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
@@ -1,10 +1,12 @@
 package com.yeshi.fanli.service.inter.order;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.exception.order.CommonOrderException;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
 
@@ -78,7 +80,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day);
+	public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day);
 
 	/**
 	 * 缁熻璁㈠崟
@@ -86,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);
 
 	/**
 	 * 缁熻璁㈠崟
@@ -94,7 +96,7 @@
 	 * @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);
 
 	/**
 	 * 鏍规嵁鏉′欢缁熻
@@ -117,4 +119,24 @@
 	 */
 	public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId);
 
+	/**
+	 * 缂撳瓨鏅�氳鍗�
+	 * 
+	 * @param taoBaoOrder
+	 * @param uid
+	 * @return
+	 */
+	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
+
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
+	 * @param uid
+	 * @param state
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
+
 }

--
Gitblit v1.8.0