From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 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 9740a2d..bbbffc2 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,10 +1,13 @@
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 {
@@ -17,14 +20,6 @@
*/
public Long countByState(Integer state);
- /**
- * 缁熻鎵�鏈夎鍗�
- *
- * @param channel
- * @return
- */
- public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,
- int sourceType) throws Exception;
/**
* 缁熻鎬婚噾棰�
@@ -135,4 +130,66 @@
*/
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);
+
+
}
--
Gitblit v1.8.0