From d73ab2021def996f6c89f3a51c8fa1b5d65fe3b3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 29 八月 2019 12:28:46 +0800 Subject: [PATCH] 奖励券跳转资金详情 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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 bcc9639..04fcc46 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 @@ -114,7 +114,7 @@ * @return */ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, - String endTime); + String endTime, Integer source); /** * 鏍规嵁鏉′欢缁熻 @@ -223,8 +223,6 @@ public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException; - - /** * 鏌ヨ璁㈠崟 * @@ -280,7 +278,15 @@ * @param pageSize * @return */ - List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, + public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, Long maxTime, int page, int pageSize); + /** + * 鏌ヨ璁㈠崟 -鏍规嵁璁㈠崟鍙� + * @param uid + * @param orderNO + * @return + */ + public List<CommonOrder> getByOrderNo(Long uid, String orderNO); + } -- Gitblit v1.8.0