From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 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 9f8b373..b1da93c 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;
 
@@ -64,7 +66,7 @@
 	 * @throws CommonOrderException
 	 */
 	long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
-			String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException;
+			String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException;
 
 	/**
 	 * 绉诲姩娈佃鍗曞垪琛�
@@ -78,8 +80,8 @@
 	 * @return
 	 */
 	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;
+			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)
+			throws CommonOrderException,Exception;
 
 	/**
 	 * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -223,11 +225,13 @@
 	 */
 
 	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
-			Integer type, Integer orderState, String startTime, String endTime, Integer source)
+			Integer type, Integer orderState, String startTime, String endTime, Integer source,
+			List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money)
 			throws CommonOrderException;
 
 	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
-			String startTime, String endTime, Integer source) throws CommonOrderException;
+			String startTime, String endTime, Integer source, 
+			List<Long> listShopId, List<Long> listGoodsId,Date minTime, BigDecimal money) throws CommonOrderException;
 
 	/**
 	 * 鏌ヨ璁㈠崟
@@ -246,7 +250,7 @@
 	 * @param orderNo
 	 * @return
 	 */
-	public JSONObject getRewardJumpInfo(String orderNo);
+	public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
 
 	/**
 	 * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�
@@ -303,5 +307,73 @@
 	 * @return
 	 */
 	public CommonOrder selectLatestValidByUid(Long uid);
+	
+	/**
+	 * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟
+	 * @param uid  
+	 * @return
+	 */
+	public CommonOrderVO firstValidOrderByUid(Long uid);
+	
+
+	/**
+	 * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟
+	 * @param uid  
+	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @return
+	 */
+	public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type);
+
+	/**
+	 * 鏌ヨ鏄惁涓婃湀鍒拌处璁㈠崟
+	 * @param uid
+	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @return
+	 */
+	public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type);
+
+	/**
+	 * 棣栦釜鍒嗕韩璁㈠崟
+	 * @param uid
+	 * @return
+	 */
+	public CommonOrder getFirstShareOrderByUid(Long uid);
+
+	/**
+	 * 璁㈠崟涓幏寰楁湁鏁堝閲�
+	 * @param orderNo
+	 * @param sourceType
+	 * @return
+	 */
+	public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType);
+
+	/**
+	 * 缁熻24灏忔椂鏈夋晥鑷喘璁㈠崟
+	 * @param uid
+	 * @param minTime
+	 * @return
+	 */
+	public long count24HValidOrderByUid(Long uid, Date minTime);
+
+	/**
+	 * 璁㈠崟缁熻鏈夋晥鏁伴噺
+	 * @param uid
+	 * @param day
+	 * @param source
+	 * @return
+	 */
+	public OrderCountVO getOrderCount(Long uid, Integer day,  List<Integer> listSource);
+
+	/**
+	 * 鎼滅储璁㈠崟淇℃伅
+	 * @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