From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 03 一月 2020 09:46:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 236e198..b1da93c 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 @@ -66,7 +66,7 @@ * @throws CommonOrderException */ long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, - String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException; + String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException; /** * 绉诲姩娈佃鍗曞垪琛� @@ -80,7 +80,7 @@ * @return */ 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) + Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException,Exception; /** @@ -362,7 +362,7 @@ * @param source * @return */ - public OrderCountVO getOrderCount(Long uid, Integer day, Integer source); + public OrderCountVO getOrderCount(Long uid, Integer day, List<Integer> listSource); /** * 鎼滅储璁㈠崟淇℃伅 -- Gitblit v1.8.0