From d029dafc262bc3c8ddc8ca6b85e4fa6e073d764a Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 01 一月 2020 14:38:47 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 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 ef60243..236e198 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 @@ -9,10 +9,12 @@ 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.order.ESOrder; import com.yeshi.fanli.entity.pdd.PDDOrder; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.exception.order.CommonOrderException; import com.yeshi.fanli.vo.order.CommonOrderVO; +import com.yeshi.fanli.vo.order.OrderCountVO; import net.sf.json.JSONObject; @@ -353,4 +355,25 @@ */ public long count24HValidOrderByUid(Long uid, Date minTime); + /** + * 璁㈠崟缁熻鏈夋晥鏁伴噺 + * @param uid + * @param day + * @param source + * @return + */ + public OrderCountVO getOrderCount(Long uid, Integer day, Integer source); + + /** + * 鎼滅储璁㈠崟淇℃伅 + * @param page + * @param size + * @param uid + * @param list + * @return + */ + public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception; + + public long countSearchOrderByUid(Long uid, List<ESOrder> list); + } -- Gitblit v1.8.0