From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 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 1c0927c..af0a07d 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
@@ -13,6 +13,7 @@
 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;
 
@@ -223,11 +224,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;
 
 	/**
 	 * 鏌ヨ璁㈠崟
@@ -321,11 +324,43 @@
 	public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type);
 
 	/**
-	 * 鏌ヨ鏄惁鏈湀鍒拌处璁㈠崟
+	 * 鏌ヨ鏄惁涓婃湀鍒拌处璁㈠崟
 	 * @param uid
 	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
 	 * @return
 	 */
-	public CommonOrderVO firstValidOrderTheMonthByUidAndType(Long uid, Integer type);
+	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, Integer source);
 
 }

--
Gitblit v1.8.0