From b800d0831438a2d354910a16325c1db6f2fb1231 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 17:41:21 +0800
Subject: [PATCH] 高危标识

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |    8 ++++++--
 1 files changed, 6 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 110e7a3..21967bf 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
@@ -174,7 +174,9 @@
 	List<CommonOrderVO> listQuery(@Param("start") long start, @Param("count") int count,
 			@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
 			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
-			@Param("endTime") String endTime, @Param("source") Integer source);
+			@Param("endTime") String endTime, @Param("source") Integer source,
+			@Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+			@Param("minTime")Date minTime, @Param("money")BigDecimal money);
 
 	/**
 	 * 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
@@ -201,7 +203,9 @@
 	 */
 	long countQuery(@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
 			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
-			@Param("endTime") String endTime, @Param("source") Integer source);
+			@Param("endTime") String endTime, @Param("source") Integer source,
+			@Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+			@Param("minTime")Date minTime, @Param("money")BigDecimal money);
 
 	long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
 			@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,

--
Gitblit v1.8.0