From e673aef27f779e1ebc016e0e38455561dd39253c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 18:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java | 298 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 225 insertions(+), 73 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..60d3302 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,73 +1,225 @@
-package com.yeshi.fanli.service.inter.order;
-
-import java.util.List;
-import java.util.Map;
-
-
-public interface CommonOrderCountService {
-
- /**
- * 褰撳墠鍚勪釜鐘舵�佽鍗曟暟
- * @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;
-
- /**
- * 缁熻鎬婚噾棰�
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @return
- * @throws Exception
- */
- public List<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
- String endTime) throws Exception;
-
- /**
- * 缁熻鎬讳釜鏁�
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @return
- * @throws Exception
- */
- public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime)
- throws Exception;
-
- /**
- * 鏍规嵁缁撶畻鏃堕棿缁熻
- * @param uid
- * @param state
- * @param day
- * @return
- * @throws Exception
- */
- public Map<String, Object> countOrderNumberBySettleTime(Long uid, Integer state, Integer day);
-
- /**
- * 鏍规嵁缁撶畻鏃堕棿绛涢�� 涓婁釜鏈堝凡缁撶畻鐨勮璁㈠崟鏁伴噺
- * @param uid
- * @return
- */
- public Map<String, Object> lastMonthSettleOrderNumber(Long uid);
-
- /**
- * 鏄惁浜х敓璁㈠崟锛氳嚜璐�佸垎浜湁鏁堣鍗曟暟閲�
- * @param uid
- * @return
- */
- public boolean hasRebateAndShareOrder(Long uid);
-
-
-}
+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.dto.ChartTDO;
+import com.yeshi.fanli.dto.order.CountOrderDTO;
+import com.yeshi.fanli.entity.admin.count.CountOrderTrackRate;
+
+public interface CommonOrderCountService {
+
+ /**
+ * 褰撳墠鍚勪釜鐘舵�佽鍗曟暟
+ *
+ * @param state
+ * 鐘舵��
+ * @return
+ */
+ public Long countByState(Integer state);
+
+
+ /**
+ * 缁熻鎬婚噾棰�
+ *
+ * @param dateType
+ * @param year
+ * @param startTime
+ * @param endTime
+ * @return
+ * @throws Exception
+ */
+ public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime, String endTime)
+ throws Exception;
+
+ /**
+ * 缁熻鎬讳釜鏁�
+ *
+ * @param dateType
+ * @param year
+ * @param startTime
+ * @param endTime
+ * @return
+ * @throws Exception
+ */
+ public List<ChartTDO> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime)
+ throws Exception;
+
+ /**
+ * 鏍规嵁缁撶畻鏃堕棿缁熻
+ *
+ * @param uid
+ * @param state
+ * @param day
+ * @return
+ * @throws Exception
+ */
+ public Map<String, Object> countOrderNumberBySettleTime(Long uid, Integer state, Integer day);
+
+ /**
+ * 鏍规嵁缁撶畻鏃堕棿绛涢�� 涓婁釜鏈堝凡缁撶畻鐨勮璁㈠崟鏁伴噺
+ *
+ * @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);
+
+ /**
+ * 缁熻鏃ユ湡鍐呬骇鐢熸湁鏁堣鍗曟暟閲忥紙杩斿埄 + 鍒嗕韩锛�
+ * @param preDay
+ * @param uid
+ * @return
+ */
+ public Integer countOderByUidAndDate(Date preDay, Long uid);
+
+ /**
+ * 缁熻鏃ユ湡鍐呬骇鐢熸湁鏁堣鍗曟暟閲忥紙杩斿埄 + 鍒嗕韩锛� 澶氫釜uid
+ * @param preDay
+ * @param uid
+ * @return
+ */
+ //public Integer countOrderByUidsAndDate(Date preDay, List<Long> list);
+ /**
+ * 缁熻鍐嶆鏃堕棿鍐� 浜х敓璁㈠崟鐨勭敤鎴锋暟閲�
+ * @param preDay
+ * @param list
+ * @return
+ */
+ public Integer countDownOrderUserByUidAndDate(Date preDay, List<Long> list);
+
+ /**
+ * 缁熻璁㈠崟浣ｉ噾
+ * @param preDay
+ * @param list
+ * @return
+ */
+ List<CountOrderDTO> countCommissionByDay(String preDay);
+
+ /**
+ * 鎬昏鍗曟暟 姣�-澶�
+ * @param preDay
+ * @return
+ */
+ public Integer countOderByDate(String preDay);
+
+ /**
+ * 缁熻璁㈠崟浣ｉ噾
+ * @param preDay
+ * @return
+ */
+ public BigDecimal countCommissionByDate(String preDay);
+
+ /**
+ * 褰撴棩姣忎釜鐢ㄦ埛涓嬪崟鏁伴噺
+ * @param preDay
+ * @return
+ */
+ public List<CountOrderDTO> countValidOrderByDay(String preDay);
+
+ /**
+ * 缁熻璺熻釜鐜�
+ * @param type
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public List<CountOrderTrackRate> getOrderTrackRate(int type, Date startTime, Date endTime);
+
+
+ /**
+ * 鏌ヨ鏈�杩�50灏忎簬10鐨勮鍗曟暟閲�
+ * @param uid
+ * @return
+ */
+ public Integer countOderByUidAndLess10(Long uid);
+
+
+
+ public Long countOrderBySourceTypeAndDay(int source, String preDay);
+
+
+ public List<Long> getDownOrderUserByListUidAndDate(Date preDay, List<Long> list);
+
+ /**
+ * 鏌ヨ褰撴棩涓嬪崟鐢ㄦ埛
+ * @param preDay
+ * @return
+ */
+ public List<Long> getUidByValidOrderByDay(String preDay);
+
+
+ /**
+ * 缁熻鏈�杩慸ay澶╂湁鏁堣鍗曟暟閲�
+ * @param uid
+ * @param source
+ * @param day
+ * @return
+ */
+ public long countOrderBySourceAndNearDay(Long uid, int source, int day);
+}
--
Gitblit v1.8.0