From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 23 八月 2019 11:59:18 +0800 Subject: [PATCH] Merge branch 'mater-1.6.0' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 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 dbeead0..bf71268 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); /** * 鏍规嵁鏉′欢缁熻 @@ -219,12 +219,10 @@ */ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, - Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException; + Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException; public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, - String startTime, String endTime) throws CommonOrderException; - - + String startTime, String endTime, Integer source) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 * @@ -233,7 +231,7 @@ * @return * @throws CommonOrderException */ - public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) + public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType) throws CommonOrderException; /** -- Gitblit v1.8.0