From 4f0197ad8aeb2dd13929d2f656d80265263775ed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 17:26:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java | 12 ++++++++++--
1 files changed, 10 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 98b99ef..3824978 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,5 +1,6 @@
package com.yeshi.fanli.dao.mybatis.order;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -22,8 +23,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<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+ @Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceType") int sourceType);
/**
@@ -44,4 +45,11 @@
*/
long countValidOrder(@Param("uid")Long uid);
+ /**
+ * 鏍规嵁璁㈠崟鍙� 鏌ヨ閲戦
+ * @param orderNo
+ * @return
+ */
+ BigDecimal getMoneyByOrderNo(@Param("orderNo")String orderNo);
+
}
\ No newline at end of file
--
Gitblit v1.8.0