From 0bd09a6935dd3abaf6b02b0b58b63b5d307a5dee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 十月 2019 10:19:35 +0800
Subject: [PATCH] 饿了么修改,微信支付统一下单修改

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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 0eca0bf..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
@@ -1,9 +1,12 @@
 package com.yeshi.fanli.dao.mybatis.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dto.ChartTDO;
 
 
 public interface CommonOrderCountMapper {
@@ -22,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);
 
 	
 	/**
@@ -36,5 +39,28 @@
 			@Param("day")Integer day);
 	
 	
+	/**
+	 *   缁熻鑷喘銆佸垎浜湁鏁堣鍗曟暟閲�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	long countValidOrder(@Param("uid")Long uid);
+	
+	/**
+	 * 鏍规嵁璁㈠崟鍙� 鏌ヨ閲戦
+	 * @param orderNo
+	 * @return
+	 */
+	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