From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 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 e95123f..8ee73c5 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,12 +1,14 @@
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 {
@@ -19,16 +21,17 @@
*/
Long countByState(@Param("state") Integer state);
+
/**
* 缁熻鎵�鏈夎鍗�
*
* @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);
+ Long countOrderBySourceTypeAndDay(@Param("preDay") String preDay, @Param("sourceType") int sourceType);
+
+
/**
* 濂栭噾缁熻
*
@@ -111,4 +114,51 @@
*/
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);
+
+ /**
+ * 閫氳繃澶氫釜uid 鏃ユ湡绛涢�� 涓嬪崟鐢ㄦ埛鏁伴噺
+ * @param preDay
+ * @param uid
+ * @return
+ */
+ Integer countDownOrderUserByUidAndDate(@Param("preDay") Date preDay,@Param("list") List<Long> list);
+
+ /**
+ * 缁熻璁㈠崟浜х敓浣ｉ噾
+ * @param preDay
+ * @param list
+ * @return
+ */
+ List<CountOrderDTO> countCommissionByDay(@Param("preDay") String preDay);
+
+ /**
+ * 閫氳繃uid 鏃ユ湡绛涢�� 涓嬪崟鏁伴噺
+ * @param preDay
+ * @return
+ */
+ Integer countOderByDate(@Param("preDay") String preDay);
+
+ /**
+ * 缁熻璁㈠崟浜х敓浣ｉ噾
+ * @param preDay
+ * @return
+ */
+ BigDecimal countCommissionByDate(@Param("preDay") String preDay);
}
\ No newline at end of file
--
Gitblit v1.8.0