From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +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/LostOrderService.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 1b761b1..f641c17 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
@@ -4,21 +4,21 @@
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 {
static final ReentrantReadWriteLock lostOrderLock = new ReentrantReadWriteLock(true);
+
+
+ void saveLostOrder(LostOrder lostOrder);
int addLostOrder(LostOrder lostOrder);
void pass(LostOrder lostOrder);
void reject(LostOrder lostOrder);
-
- List<LostOrder> findLostOrderList(String key, int page);
-
- int getCount(String key);
LostOrder getOne(long id);
@@ -45,14 +45,14 @@
*
* @param orderId
*/
- void processSuceess(String orderId);
+ void processSuceess(String orderId,int orderType);
/**
* 璁㈠崟澶勭悊澶辫触
*
* @param orderId
*/
- void processFail(String orderId);
+ void processFail(String orderId,int orderType);
/**
* 璁㈠崟澶勭悊澶辫触鎵归噺澶勭悊
@@ -75,13 +75,15 @@
/**
* 缁熻鐢ㄦ埛鐢宠瘔娆℃暟
+ *
* @param uid
* @return
*/
- public Map<String, Object> countByUid(long uid);
+ public Map<String, Object> countByUid(long uid);
/**
* 鍚庣鏌ヨ
+ *
* @param start
* @param count
* @param key
@@ -89,8 +91,35 @@
* @param handleType
* @return
*/
- public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType);
+ public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType, Integer type);
- public long countQuery(String key, Integer state, Integer handleType);
+ 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;
+
+ /**
+ * 鏍规嵁鐘舵�佷笌澶勭悊缁撴灉杩囧幓鍊�
+ *
+ * @param state
+ * @param resultCode
+ * @return
+ */
+ public List<LostOrder> listByStateAndResultCode(int state, int resultCode, int page, int pageSize);
}
--
Gitblit v1.8.0