From cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 29 七月 2019 10:46:32 +0800 Subject: [PATCH] 订单商品类型处理 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 57 ++++++++++++++++++++++++++------------------------------- 1 files changed, 26 insertions(+), 31 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 ac512ce..bcc9639 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,6 +5,7 @@ import java.util.List; import java.util.Map; +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; @@ -46,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; /** @@ -62,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; /** * 绉诲姩娈佃鍗曞垪琛� @@ -75,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; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -84,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); /** * 缁熻璁㈠崟 @@ -92,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); /** * 缁熻璁㈠崟 @@ -100,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); /** * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰� @@ -125,7 +126,7 @@ * @return */ public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime, - Integer day); + Integer day, Integer source); /** * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟 @@ -218,31 +219,11 @@ */ 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; - /** - * 鏍规嵁璁㈠崟鍙疯幏鍙栦俊鎭� - * - * @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; /** * 鏌ヨ璁㈠崟 @@ -252,7 +233,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; /** @@ -288,4 +269,18 @@ */ public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId); + /** + * 鏍规嵁鏉′欢鏌ヨ璁㈠崟 + * + * @param sourceType + * @param state + * @param minTime + * @param maxTime + * @param page + * @param pageSize + * @return + */ + List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, + Long maxTime, int page, int pageSize); + } -- Gitblit v1.8.0