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/LostOrderService.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java
index f641c17..93ae50f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java
@@ -1,10 +1,10 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import com.yeshi.fanli.dto.ChartTDO;
 import com.yeshi.fanli.entity.bus.user.LostOrder;
 
 public interface LostOrderService {
@@ -95,23 +95,8 @@
 
 	public long countQuery(String key, Integer state, Integer handleType, Integer type);
 
-	/**
-	 * 鏈湀鐢宠瘔璁㈠崟鏁� 缁熻
-	 * 
-	 * @param dateType
-	 * @param resultCode
-	 *            锛堟湭澶勭悊锛� 鎴愬姛 澶辫触锛�
-	 * @param year
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 * @throws Exception
-	 */
-	public List<ChartTDO> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
-			String endTime) throws Exception;
 
-	public List<ChartTDO> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
-			throws Exception;
+
 
 	/**
 	 * 鏍规嵁鐘舵�佷笌澶勭悊缁撴灉杩囧幓鍊�
@@ -122,4 +107,19 @@
 	 */
 	public List<LostOrder> listByStateAndResultCode(int state, int resultCode, int page, int pageSize);
 
+	
+	/**
+	 * 缁熻鐢宠瘔璁㈠崟鏁伴噺
+	 * @param preDay
+	 * @return
+	 */
+	public Integer countLostOrderNum(String preDay);
+	
+	/**
+	 * 缁熻鐢宠瘔鎵惧洖浣i噾
+	 * @param preDay
+	 * @return
+	 */
+	public BigDecimal countAppealMoney(String preDay);
+
 }

--
Gitblit v1.8.0