From baacd1378b33c4a84ee7a4998fb08fd9979ee4e1 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 09 一月 2019 11:02:52 +0800 Subject: [PATCH] Merge branch 'dev-hongbao' --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 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 e2cb78c..87f1f97 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 @@ -1,11 +1,13 @@ package com.yeshi.fanli.service.inter.order; import java.math.BigDecimal; +import java.util.Date; 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.order.HongBaoOrder; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.exception.order.CommonOrderException; import com.yeshi.fanli.vo.order.CommonOrderVO; @@ -126,9 +128,30 @@ * @param uid * @return */ - public CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException; - - - + 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锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺 + * @param uid + * @param state + * @param minDate + * @param maxDate + * @return + */ + long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate); } -- Gitblit v1.8.0