From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java |   85 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
index df938bf..9740a2d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
@@ -1,28 +1,34 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import com.yeshi.fanli.dto.ChartTDO;
 
 public interface CommonOrderCountService {
 
 	/**
 	 * 褰撳墠鍚勪釜鐘舵�佽鍗曟暟
-	 * @param state 鐘舵��
+	 * 
+	 * @param state
+	 *            鐘舵��
 	 * @return
 	 */
 	public Long countByState(Integer state);
 
 	/**
-	 *  缁熻鎵�鏈夎鍗�
+	 * 缁熻鎵�鏈夎鍗�
+	 * 
 	 * @param channel
 	 * @return
 	 */
-	public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime,
-			String endTime) throws Exception;
+	public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,
+			int sourceType) throws Exception;
 
 	/**
 	 * 缁熻鎬婚噾棰�
+	 * 
 	 * @param dateType
 	 * @param year
 	 * @param startTime
@@ -30,11 +36,12 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
-			String endTime)	throws Exception;
+	public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime, String endTime)
+			throws Exception;
 
 	/**
 	 * 缁熻鎬讳釜鏁�
+	 * 
 	 * @param dateType
 	 * @param year
 	 * @param startTime
@@ -42,11 +49,12 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime)
+	public List<ChartTDO> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime)
 			throws Exception;
 
 	/**
 	 * 鏍规嵁缁撶畻鏃堕棿缁熻
+	 * 
 	 * @param uid
 	 * @param state
 	 * @param day
@@ -57,17 +65,74 @@
 
 	/**
 	 * 鏍规嵁缁撶畻鏃堕棿绛涢�� 涓婁釜鏈堝凡缁撶畻鐨勮璁㈠崟鏁伴噺
+	 * 
 	 * @param uid
 	 * @return
 	 */
 	public Map<String, Object> lastMonthSettleOrderNumber(Long uid);
 
 	/**
-	 *   鏄惁浜х敓璁㈠崟锛氳嚜璐�佸垎浜湁鏁堣鍗曟暟閲�
-	 * @param uid
+	 * 鏍规嵁璁㈠崟鍙� 缁熻濂栧姳鍒稿姞鎴愰噾棰�
+	 * 
+	 * @param orderNo
 	 * @return
 	 */
-	public boolean hasRebateAndShareOrder(Long uid);
+	BigDecimal getMoneyByOrderNo(String orderNo);
 
+	/**
+	 * 缁熻宸插埌璐﹁繑鍒╄鍗�
+	 * 
+	 * @param uid
+	 * @param dateTime
+	 * @return
+	 */
+	public long countValidOrderByDate(Long uid, String dateTime);
+
+	/**
+	 * 鏌ヨ鐢ㄦ埛鍦ㄥ悓涓�搴楅摵璐拱瓒呰繃涓�瀹氭暟閲忓晢鍝佺殑搴楅摵鏁伴噺
+	 * 
+	 * @param typeList
+	 *            -绾㈠寘绫诲瀷
+	 * @param uid
+	 *            -鐢ㄦ埛ID
+	 * @param minSameShopGoodsCount
+	 *            -鍚屼竴搴楅摵涔扮殑鏈�灏忚鍗曟暟
+	 * @return
+	 */
+	long countSameShopOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameShopGoodsCount);
+
+	/**
+	 * 鏌ヨ鐢ㄦ埛璐拱鐩稿悓鍟嗗搧瓒呰繃涓�瀹氱殑璁㈠崟鏁伴噺鐨勫晢鍝佹暟閲�
+	 * 
+	 * @param typeList
+	 * @param uid
+	 * @param minSameGoodsOrderCount
+	 * @return
+	 */
+	long countSameGoodsOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameGoodsOrderCount);
+
+	
+	/**
+	 * 鏌ヨ鐢ㄦ埛鍦ㄥ悓涓�搴楅摵璐拱瓒呰繃涓�瀹氭暟閲忓晢鍝佺殑搴楅摵id
+	 * 
+	 * @param typeList
+	 *            -绾㈠寘绫诲瀷
+	 * @param uid
+	 *            -鐢ㄦ埛ID
+	 * @param minSameShopGoodsCount
+	 *            -鍚屼竴搴楅摵涔扮殑鏈�灏忚鍗曟暟
+	 * @return
+	 */
+	List<Long> getSameShopOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameShopGoodsCount);
+
+	/**
+	 * 鏌ヨ鐢ㄦ埛璐拱鐩稿悓鍟嗗搧瓒呰繃涓�瀹氱殑璁㈠崟鏁伴噺鐨勫晢鍝乮d
+	 * 
+	 * @param typeList
+	 * @param uid
+	 * @param minSameGoodsOrderCount
+	 * @return
+	 */
+	List<Long> getSameGoodsOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameGoodsOrderCount);
 
 }

--
Gitblit v1.8.0