From 4e557c1b42a6952c0c7e1deb8faa89a5d54b11d1 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 29 十二月 2018 14:49:20 +0800 Subject: [PATCH] 新版订单同步修改 增加微信域名拦截检测 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 0c93087..a51a11b 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; /** * 绉诲姩娈佃鍗曞垪琛� @@ -61,8 +61,8 @@ * @param type 鍒拌处鐘舵�� * @return */ - public List<CommonOrderVO> getOrderByUid(Long page, Long uid, Integer state, Integer type, - String orderNo, String startTime, String endTime) throws CommonOrderException; + public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, + Integer orderState, String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -77,14 +77,14 @@ * @param uid * @return */ - public long countOrder(Long uid, Integer isToday); + public long countOrder(Long uid, Integer type, Integer isToday); /** * 缁熻璁㈠崟 * @param uid * @return */ - public BigDecimal countOrderMoney(Long uid, Integer isToday); + public BigDecimal countOrderMoney(Long uid, Integer type, Integer isToday); /** * 鏍规嵁鏉′欢缁熻 -- Gitblit v1.8.0