From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 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..f205e96 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,5 +1,6 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -19,7 +20,7 @@
 	 * @return
 	 */
 	public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime,
-			String endTime) throws Exception;
+			String endTime,int sourceType) throws Exception;
 
 	/**
 	 * 缁熻鎬婚噾棰�
@@ -63,11 +64,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