From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 04 十一月 2019 09:55:55 +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/CommonOrderService.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java index 9cbbb53..faff362 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java @@ -79,7 +79,7 @@ */ public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source) - throws CommonOrderException; + throws CommonOrderException,Exception; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -303,5 +303,29 @@ * @return */ public CommonOrder selectLatestValidByUid(Long uid); + + /** + * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟 + * @param uid + * @return + */ + public CommonOrderVO firstValidOrderByUid(Long uid); + + + /** + * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟 + * @param uid + * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� + * @return + */ + public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type); + + /** + * 鏌ヨ鏄惁涓婃湀鍒拌处璁㈠崟 + * @param uid + * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� + * @return + */ + public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type); } -- Gitblit v1.8.0