From aa552facf6d833acab0d3e3e29bda2a0fb826ffe Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 16:14:13 +0800
Subject: [PATCH] 品牌缓存生效

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index ea15e8c..42eff49 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -174,7 +174,9 @@
 	List<CommonOrderVO> listQuery(@Param("start") long start, @Param("count") int count,
 			@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
 			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
-			@Param("endTime") String endTime, @Param("source") Integer source);
+			@Param("endTime") String endTime, @Param("source") Integer source,
+			@Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+			@Param("minTime")Date minTime, @Param("money")BigDecimal money);
 
 	/**
 	 * 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
@@ -201,7 +203,9 @@
 	 */
 	long countQuery(@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
 			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
-			@Param("endTime") String endTime, @Param("source") Integer source);
+			@Param("endTime") String endTime, @Param("source") Integer source,
+			@Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+			@Param("minTime")Date minTime, @Param("money")BigDecimal money);
 
 	long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
 			@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
@@ -300,4 +304,36 @@
 	 */
 	List<CommonOrder> listByUid(@Param("uid")Long uid,@Param("stateList") List<Integer> stateList,@Param("start") long start,@Param("count") int count);
 
+	
+	/**
+	 * 鏌ヨ棣栫瑪鏈夋晥鍒拌处璁㈠崟
+	 * @param uid  
+	 * @param typeHB 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @param typeDate 鏃ユ湡绫诲瀷锛� 3鏈湀 4涓婃湀
+	 * @return
+	 */
+	CommonOrderVO firstValidOrderByUid(@Param("uid") Long uid, @Param("typeHB") Integer typeHB,
+			@Param("typeDate") Integer typeDate);
+	
+	
+	/**
+	 * 鑾峰彇棣栫瑪鍒嗕韩璁㈠崟锛�
+	 * @param uid  
+	 * @return
+	 */
+	CommonOrder getFirstShareOrderByUid(@Param("uid") Long uid);
+	
+	/**
+	 * 缁熻璁㈠崟鍙峰埌璐﹂噾棰�
+	 * @param uid
+	 * @return
+	 */
+	BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(@Param("orderNo") String orderNo, @Param("sourceType") Integer sourceType);
+	
+	/**
+	 * 缁熻24灏忔椂鏈夋晥鑷喘璁㈠崟
+	 * @param uid
+	 * @return
+	 */
+	long count24HValidOrderByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0