From 3164f689c2a1fe18e2ea7c5f512657305790a3d2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 16:20:15 +0800
Subject: [PATCH] 拉新券统计

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index ca7be40..9485874 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -15,6 +15,7 @@
 
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
 
+	
 	/**
 	 * 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
 	 * 
@@ -302,6 +303,15 @@
 	 * @return
 	 */
 	List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);
+	
+	/**
+	 * 鏍规嵁璁㈠崟鍙锋煡璇�
+	 * 
+	 * @param orderNO
+	 * @return
+	 */
+	List<CommonOrder> getByOrderNoAndSourceType(@Param("uid") Long uid, @Param("orderNo") String orderNo,
+			@Param("sourceType") int sourceType);
 
 	
 	/**
@@ -393,7 +403,7 @@
 	List<CommonOrderVO> getOrderList(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
 			@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
 			@Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime,
-			@Param("day") Integer day, @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
+			@Param("day") Integer day, @Param("listSource") List<Integer> listSource);
 
 	/**
 	 * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -406,7 +416,7 @@
 	long countOrderList(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
 			@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
 			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
-			@Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
+			@Param("listSource") List<Integer> listSource);
 	
 
 	/**

--
Gitblit v1.8.0