From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   16 ++++++++++++++--
 1 files changed, 14 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 21c6a49..ca7be40 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
@@ -393,7 +393,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("day") Integer day, @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
 
 	/**
 	 * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -406,7 +406,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("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
 	
 
 	/**
@@ -417,4 +417,16 @@
 	 */
 	Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
 	
+	/**
+	 * 鑾峰彇鏈�鏂扮殑娣樺疂璁㈠崟鍙�
+	 * @return
+	 */
+	String getNewestOrderNoByTaoBao();
+	
+	/**
+	 * 鏍规嵁璁㈠崟鍙疯繘琛宻ous
+	 * @param orderNo
+	 * @return
+	 */
+	List<CommonOrder> listByOrderNo(@Param("orderNo") String orderNo);
 }
\ No newline at end of file

--
Gitblit v1.8.0