From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java | 27 +++++++++++++++++++--------
1 files changed, 19 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 df938bf..f8b7a66 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,7 +1,10 @@
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 {
@@ -18,8 +21,8 @@
* @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;
/**
* 缁熻鎬婚噾棰�
@@ -30,7 +33,7 @@
* @return
* @throws Exception
*/
- public List<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
+ public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
String endTime) throws Exception;
/**
@@ -42,7 +45,7 @@
* @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;
/**
@@ -63,11 +66,19 @@
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);
}
--
Gitblit v1.8.0