From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 923f122..67ffac2 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
@@ -6,6 +6,8 @@
import org.apache.ibatis.annotations.Param;
+import com.yeshi.fanli.dto.ChartTDO;
+
public interface CommonOrderCountMapper {
@@ -23,8 +25,8 @@
* @param channel
* @return
*/
- List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
+ List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+ @Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceType") int sourceType);
/**
@@ -52,4 +54,13 @@
*/
BigDecimal getMoneyByOrderNo(@Param("orderNo")String orderNo);
+
+ /**
+ * 缁熻宸插埌璐﹁繑鍒╄鍗�
+ * @param uid
+ * @param dateTime
+ * @return
+ */
+ long countValidOrderByDate(@Param("uid")Long uid, @Param("dateTime")String dateTime);
+
}
\ No newline at end of file
--
Gitblit v1.8.0