From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java |  182 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 163 insertions(+), 19 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
index 6aeb8f9..20ddbaa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
@@ -1,31 +1,47 @@
 package com.yeshi.fanli.dao.mybatis.order;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.dto.order.CountOrderDTO;
 
 public interface CommonOrderCountMapper {
-	
-	
+
 	/**
 	 * 褰撳墠鍚勪釜鐘舵�佽鍗曟暟
-	 * @param state 鐘舵��
+	 * 
+	 * @param state
+	 *            鐘舵��
 	 * @return
 	 */
-	Long countByState(@Param("state")Integer state);
-	
+	Long countByState(@Param("state") Integer state);
+
 	
 	/**
-	 *  缁熻鎵�鏈夎鍗�
+	 * 缁熻鎵�鏈夎鍗�
+	 * 
 	 * @param channel
 	 * @return
 	 */
-	List<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceType") int sourceType);
+	Long countOrderBySourceTypeAndDay(@Param("preDay") String preDay, @Param("sourceType") int sourceType);
 
+	
+	/**
+	 * 缁熻鎵�鏈夎鍗�
+	 * 
+	 * @param channel
+	 * @return
+	 */
+	List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("sourceType") int sourceType);
+
+	
 	
 	/**
 	 * 濂栭噾缁熻
@@ -33,32 +49,160 @@
 	 * @param uid
 	 * @return
 	 */
-	Map<String, Object> countOrderNumberBySettleTime(@Param("uid")Long uid, @Param("state")Integer state,
-			@Param("day")Integer day);
-	
-	
+	Map<String, Object> countOrderNumberBySettleTime(@Param("uid") Long uid, @Param("state") Integer state,
+			@Param("day") Integer day);
+
 	/**
-	 *   缁熻鑷喘銆佸垎浜湁鏁堣鍗曟暟閲�
+	 * 缁熻鑷喘銆佸垎浜湁鏁堣鍗曟暟閲�
 	 * 
 	 * @param uid
 	 * @return
 	 */
-	long countValidOrder(@Param("uid")Long uid);
-	
+	long countValidOrder(@Param("uid") Long uid);
+
 	/**
 	 * 鏍规嵁璁㈠崟鍙� 鏌ヨ閲戦
+	 * 
 	 * @param orderNo
 	 * @return
 	 */
-	BigDecimal getMoneyByOrderNo(@Param("orderNo")String orderNo);
-	
-	
+	BigDecimal getMoneyByOrderNo(@Param("orderNo") String orderNo);
+
 	/**
 	 * 缁熻宸插埌璐﹁繑鍒╄鍗�
+	 * 
 	 * @param uid
 	 * @param dateTime
 	 * @return
 	 */
-	long countValidOrderByDate(@Param("uid")Long uid, @Param("dateTime")String dateTime);
+	long countValidOrderByDate(@Param("uid") Long uid, @Param("dateTime") String dateTime);
+
+	/**
+	 * 鏌ヨ鐢ㄦ埛鍦ㄥ悓涓�搴楅摵璐拱瓒呰繃涓�瀹氭暟閲忓晢鍝佺殑搴楅摵鏁伴噺
+	 * 
+	 * @param typeList
+	 *            -绾㈠寘绫诲瀷
+	 * @param uid
+	 *            -鐢ㄦ埛ID
+	 * @param minSameShopGoodsCount
+	 *            -鍚屼竴搴楅摵涔扮殑鏈�灏忚鍗曟暟
+	 * @return
+	 */
+	long countSameShopOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,
+			@Param("minSameShopGoodsCount") int minSameShopGoodsCount);
+	
+	/**
+	 * 鏌ヨ鐢ㄦ埛璐拱鐩稿悓鍟嗗搧瓒呰繃涓�瀹氱殑璁㈠崟鏁伴噺鐨勫晢鍝佹暟閲�
+	 * @param typeList
+	 * @param uid
+	 * @param minSameGoodsOrderCount
+	 * @return
+	 */
+	long countSameGoodsOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,
+			@Param("minSameGoodsOrderCount") int minSameGoodsOrderCount);
+	
+	
+	/**
+	 * 鏌ヨ鐢ㄦ埛鍦ㄥ悓涓�搴楅摵璐拱瓒呰繃涓�瀹氭暟閲忓晢鍝佺殑搴楅摵id
+	 * 
+	 * @param typeList
+	 *            -绾㈠寘绫诲瀷
+	 * @param uid
+	 *            -鐢ㄦ埛ID
+	 * @param minSameShopGoodsCount
+	 *            -鍚屼竴搴楅摵涔扮殑鏈�灏忚鍗曟暟
+	 * @return
+	 */
+	List<Long> getSameShopOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,
+			@Param("minSameShopGoodsCount") int minSameShopGoodsCount);
+	
+	/**
+	 * 鏌ヨ鐢ㄦ埛璐拱鐩稿悓鍟嗗搧瓒呰繃涓�瀹氱殑璁㈠崟鏁伴噺鐨勫晢鍝乮d
+	 * @param typeList
+	 * @param uid
+	 * @param minSameGoodsOrderCount
+	 * @return
+	 */
+	List<Long> getSameGoodsOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,
+			@Param("minSameGoodsOrderCount") int minSameGoodsOrderCount);
+	
+	
+	/**
+	 * 閫氳繃uid 鏃ユ湡绛涢��   涓嬪崟鏁伴噺
+	 * @param preDay
+	 * @param uid  
+	 * @return
+	 */
+	Integer countOderByUidAndDate(@Param("preDay") Date preDay,@Param("uid") Long uid);
+	
+	/**
+	 *  鏃ユ湡绛涢��  姣忎釜鐢ㄦ埛涓嬪崟鏁伴噺
+	 * @param preDay
+	 * @param uid  
+	 * @return
+	 */
+	List<CountOrderDTO> countValidOrderByDay(@Param("preDay") String preDay);
+	
+	/**
+	 * 鏌ヨ褰撴棩涓嬪崟鐢ㄦ埛
+	 * @param preDay
+	 * @return
+	 */
+	List<Long> getUidByValidOrderByDay(@Param("preDay") String preDay);
+	
+	/**
+	 * 閫氳繃澶氫釜uid 鏃ユ湡绛涢�� 涓嬪崟鐢ㄦ埛鏁伴噺
+	 * @param preDay
+	 * @param uid  
+	 * @return
+	 */
+	Integer countDownOrderUserByUidAndDate(@Param("preDay") Date preDay,@Param("list") List<Long> list);
+	
+	/**
+	 * 缁熻璁㈠崟浜х敓浣i噾
+	 * @param preDay
+	 * @param list
+	 * @return
+	 */
+	List<CountOrderDTO> countCommissionByDay(@Param("preDay") String preDay);
+	
+	/**
+	 * 閫氳繃uid 鏃ユ湡绛涢��   涓嬪崟鏁伴噺
+	 * @param preDay
+	 * @return
+	 */
+	Integer countOderByDate(@Param("preDay") String preDay);
+	
+	/**
+	 * 缁熻璁㈠崟浜х敓浣i噾
+	 * @param preDay
+	 * @return
+	 */
+	BigDecimal countCommissionByDate(@Param("preDay") String preDay);
+	
+	
+	/**
+	 * 鏌ヨ鏈�杩�50灏忎簬10鐨勮鍗曟暟閲�
+	 * @param uid
+	 * @return
+	 */
+	Integer countOderByUidAndLess10(@Param("uid") Long uid);
+	
+	
+	List<Long> getDownOrderUserByListUidAndDate(@Param("preDay") Date preDay,@Param("list") List<Long> list);
+	
+	
+	/**
+	 * 缁熻杩� day澶╂湁鏁堣鍗曟暟閲�
+	 * @param uid
+	 * @param source
+	 * @param day
+	 * @return
+	 */
+	Long countOrderBySourceAndNearDay(@Param("uid") Long uid, @Param("source") int source, @Param("day") int day);
+	
+	
+	
+	
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0