From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 23 五月 2020 09:54:38 +0800 Subject: [PATCH] 足迹、收藏订单兼容新需求 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 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 6e35cdb..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,5 +1,6 @@ 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; @@ -90,27 +91,12 @@ * @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<Map<String, Object>> countLostNum(Integer dateType, Integer resultCode, String year, String startTime, - String endTime) throws Exception; - public List<Map<String, Object>> countAppealMoney(Integer dateType, String year, String startTime, String endTime) - throws Exception; + /** * 鏍规嵁鐘舵�佷笌澶勭悊缁撴灉杩囧幓鍊� @@ -121,4 +107,19 @@ */ public List<LostOrder> listByStateAndResultCode(int state, int resultCode, int page, int pageSize); + + /** + * 缁熻鐢宠瘔璁㈠崟鏁伴噺 + * @param preDay + * @return + */ + public Integer countLostOrderNum(String preDay, int resultCode); + + /** + * 缁熻鐢宠瘔鎵惧洖浣ｉ噾 + * @param preDay + * @return + */ + public BigDecimal countAppealMoney(String preDay); + } -- Gitblit v1.8.0