From 0d9ac58dc11f54351e5e18dba8e950717d78019f Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 09 九月 2019 14:55:24 +0800 Subject: [PATCH] 搜索发现 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 59 ++++++++++++++++++++++------------------------------------- 1 files changed, 22 insertions(+), 37 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 513d188..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 @@ -5,8 +5,7 @@ import java.util.List; import java.util.Map; -import org.apache.ibatis.annotations.Param; - +import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.jd.JDOrder; import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.pdd.PDDOrder; @@ -48,7 +47,7 @@ * @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) + Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException; /** @@ -64,7 +63,7 @@ * @throws CommonOrderException */ long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, - String startTime, String endTime, Integer dateType) throws CommonOrderException; + String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException; /** * 绉诲姩娈佃鍗曞垪琛� @@ -77,8 +76,8 @@ * 鍒拌处鐘舵�� * @return */ - public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, Integer orderState, - String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException; + 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) throws CommonOrderException; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -86,7 +85,7 @@ * @param uid * @return */ - public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day); + public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source); /** * 缁熻璁㈠崟 @@ -94,7 +93,7 @@ * @param uid * @return */ - public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime); + public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime, Integer source); /** * 缁熻璁㈠崟 @@ -102,7 +101,7 @@ * @param uid * @return */ - public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime); + public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime, Integer source); /** * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰� @@ -115,7 +114,7 @@ * @return */ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, - String endTime); + String endTime, Integer source); /** * 鏍规嵁鏉′欢缁熻 @@ -127,7 +126,7 @@ * @return */ public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime, - Integer day); + Integer day, Integer source); /** * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟 @@ -220,32 +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; - - /** - * 鏍规嵁璁㈠崟鍙疯幏鍙栦俊鎭� - * - * @param orderNo - * @return - * @throws CommonOrderException - */ - public CommonOrderVO getInfoByOrderNo(Long uid, String orderNo) throws CommonOrderException; - - /** - * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭� - * - * @param uid - * @param state - * @param orderNo - * @return - * @throws CommonOrderException - */ - public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer state, String orderNo) - throws CommonOrderException; - + String startTime, String endTime, Integer source) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 * @@ -254,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; /** @@ -301,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