From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java | 62 ++++++++++++++++++++++++++++--- 1 files changed, 56 insertions(+), 6 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 bd8d90d..244d718 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,6 +1,8 @@ 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.entity.bus.user.LostOrder; @@ -8,16 +10,15 @@ 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); @@ -44,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); /** * 璁㈠崟澶勭悊澶辫触鎵归噺澶勭悊 @@ -72,4 +73,53 @@ */ void deleteLostOrderByUid(long uid); + /** + * 缁熻鐢ㄦ埛鐢宠瘔娆℃暟 + * + * @param uid + * @return + */ + public Map<String, Object> countByUid(long uid); + + /** + * 鍚庣鏌ヨ + * + * @param start + * @param count + * @param key + * @param state + * @param handleType + * @return + */ + 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, Integer type); + + + + + /** + * 鏍规嵁鐘舵�佷笌澶勭悊缁撴灉杩囧幓鍊� + * + * @param state + * @param resultCode + * @return + */ + public List<LostOrder> listByStateAndResultCode(int state, int resultCode, int page, int pageSize); + + + /** + * 缁熻鐢宠瘔璁㈠崟鏁伴噺 + * @param preDay + * @return + */ + public Integer countLostOrderNum(String preDay, int resultCode); + + /** + * 缁熻鐢宠瘔鎵惧洖浣i噾 + * @param preDay + * @return + */ + public BigDecimal countAppealMoney(String preDay); + } -- Gitblit v1.8.0