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/dao/mybatis/order/CommonOrderMapper.java |   70 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 5 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 624e1bd..c8f7353 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
@@ -9,7 +9,9 @@
 
 import com.yeshi.fanli.dao.BaseMapper;
 import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.order.ESOrder;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.OrderCountVO;
 
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
 
@@ -25,7 +27,7 @@
 	List<CommonOrderVO> listUserOrder(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
 			@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
 			@Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime,
-			@Param("day") Integer day, @Param("source") Integer source);
+			@Param("day") Integer day, @Param("listSource") List<Integer> listSource);
 
 	/**
 	 * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -38,7 +40,7 @@
 	long countUserOrder(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
 			@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
 			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
-			@Param("source") Integer source);
+			@Param("listSource") List<Integer> listSource);
 
 	/**
 	 * 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
@@ -79,6 +81,14 @@
 	Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day,
 			@Param("source") Integer source);
 
+	
+	/**
+	 * 缁熻鏈夋晥璁㈠崟鏁伴噺
+	 * @param uid
+	 * @return
+	 */
+	OrderCountVO getOrderCount(@Param("uid") Long uid, @Param("day")Integer day, @Param("listSource") List<Integer> listSource);
+	
 	/**
 	 * 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
 	 * 
@@ -174,7 +184,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 +213,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,
@@ -304,10 +318,56 @@
 	/**
 	 * 鏌ヨ棣栫瑪鏈夋晥鍒拌处璁㈠崟
 	 * @param uid  
-	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @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);
+	
+	
+	/**
+	 * 鎼滅储璁㈠崟
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param list
+	 * @return
+	 */
+	List<CommonOrderVO> searchOrderByUid(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+			@Param("list")List<ESOrder> list);
+
+	
+	/**
+	 * 鎼滅储璁㈠崟
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param list
+	 * @return
+	 */
+	long countSearchOrderByUid(@Param("uid") Long uid, @Param("list")List<ESOrder> list);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0