From 568cce9bd9b986c90aaeabe1a9a5ae5a6eefdaf3 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 09 一月 2019 18:20:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 21 +++------------------ 1 files changed, 3 insertions(+), 18 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 87f1f97..c6ffbc8 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,6 @@ import java.util.List; import java.util.Map; -import org.apache.ibatis.annotations.Param; - import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.exception.order.CommonOrderException; @@ -82,7 +80,7 @@ * @param uid * @return */ - public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day); + public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day); /** * 缁熻璁㈠崟 @@ -90,7 +88,7 @@ * @param uid * @return */ - public long countOrder(Long uid, Integer type, Integer isToday); + public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime); /** * 缁熻璁㈠崟 @@ -98,7 +96,7 @@ * @param uid * @return */ - public BigDecimal countOrderMoney(Long uid, Integer type, Integer isToday); + public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime); /** * 鏍规嵁鏉′欢缁熻 @@ -130,19 +128,6 @@ */ public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException; - /** - * 鏍规嵁鎻愭潯浠剁粺璁″凡鍒拌处閲戦 - * - * @param uid - * @param type - * @param orderNo - * @param startTime - * @param endTime - * @param day - * @return - */ - public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime, - String endTime, Integer day); /** * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺 -- Gitblit v1.8.0