From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   25 ++++++++++++-------------
 1 files changed, 12 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 4312b76..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,6 +1,7 @@
 package com.yeshi.fanli.service.inter.order;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -79,7 +80,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day);
+	public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day);
 
 	/**
 	 * 缁熻璁㈠崟
@@ -87,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);
 
 	/**
 	 * 缁熻璁㈠崟
@@ -95,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);
 
 	/**
 	 * 鏍规嵁鏉′欢缁熻
@@ -125,19 +126,17 @@
 	 * @param uid
 	 * @return
 	 */
-	public CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException;
-	
+	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
+
+
 	/**
-	 * 鏍规嵁鎻愭潯浠剁粺璁″凡鍒拌处閲戦
+	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
 	 * @param uid
-	 * @param type
-	 * @param orderNo
-	 * @param startTime
-	 * @param endTime
-	 * @param day
+	 * @param state
+	 * @param minDate
+	 * @param maxDate
 	 * @return
 	 */
-	public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime, 
-			String endTime, Integer day);
+	long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
 
 }

--
Gitblit v1.8.0