From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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..4312b76 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,6 +5,7 @@
 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;
 
@@ -117,4 +118,26 @@
 	 */
 	public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId);
 
+	/**
+	 * 缂撳瓨鏅�氳鍗�
+	 * 
+	 * @param taoBaoOrder
+	 * @param uid
+	 * @return
+	 */
+	public CommonOrder addTaoBaoOrder(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);
+
 }

--
Gitblit v1.8.0