From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 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 f205e96..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
@@ -4,26 +4,31 @@
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,int sourceType) throws Exception;
+ public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,
+ int sourceType) throws Exception;
/**
* 缁熻鎬婚噾棰�
+ *
* @param dateType
* @param year
* @param startTime
@@ -31,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
@@ -43,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
@@ -58,25 +65,74 @@
/**
* 鏍规嵁缁撶畻鏃堕棿绛涢�� 涓婁釜鏈堝凡缁撶畻鐨勮璁㈠崟鏁伴噺
+ *
* @param uid
* @return
*/
public Map<String, Object> lastMonthSettleOrderNumber(Long uid);
/**
- * 鏍规嵁璁㈠崟鍙� 缁熻濂栧姳鍒稿姞鎴愰噾棰�
+ * 鏍规嵁璁㈠崟鍙� 缁熻濂栧姳鍒稿姞鎴愰噾棰�
+ *
* @param orderNo
* @return
*/
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