From dd865e62a9e687aeb2436a59a76bbe461bd83eaf Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期四, 27 十二月 2018 09:45:00 +0800 Subject: [PATCH] 返回字段结构调整 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 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 519c567..468b662 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 @@ -36,8 +36,8 @@ * @return * @throws CommonOrderException */ - public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type, - String orderNo, String startTime, String endTime) throws CommonOrderException; + public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, + Integer type,Integer orderState,String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException; /** * 缁熻鏌ヨ @@ -50,8 +50,8 @@ * @return * @throws CommonOrderException */ - long countGroupOrderNoByUid(Long uid, Integer state, Integer type, String orderNo, String startTime, String endTime) - throws CommonOrderException; + long countGroupOrderNoByUid(Long uid, Integer state, Integer type,Integer orderState, + String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException; /** * 绉诲姩娈佃鍗曞垪琛� @@ -62,7 +62,7 @@ * @return */ public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, - String orderNo, String startTime, String endTime) throws CommonOrderException; + Integer orderState, String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -94,19 +94,7 @@ * @param endTime * @return */ - public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime); - - /** - * 濂栭噾鍒楄〃缁熻 - * @param page - * @param uid - * @param type - * @param day - * @return - * @throws CommonOrderException - */ - public List<CommonOrderVO> listBonusOrder(Integer page, Long uid, Integer type, Integer day) throws CommonOrderException; - - public Map<String, BigDecimal> countBonusOrderByState(Long uid, Integer type, Integer day); + public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, + String endTime, Integer day); } -- Gitblit v1.8.0