From 8222e8b237c5dfb0affcdc03335bfadc06403bf8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 19 七月 2019 15:49:39 +0800
Subject: [PATCH] 奖励券使用优化类型
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 582184a..0c7b324 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
@@ -171,14 +171,14 @@
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("endTime") String endTime, @Param("source")Integer source);
/**
* 缁熻
*/
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("endTime") String endTime, @Param("source")Integer source);
/**
* 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃
@@ -213,11 +213,34 @@
/**
* 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟璇︽儏
+ *
* @param sourceType
* @param tradeId
* @return
*/
-
+
CommonOrder selectBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
+ /**
+ * 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟鍒楄〃
+ *
+ * @param sourceType
+ * @param tradeId
+ * @return
+ */
+ List<CommonOrder> listBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
+
+ /**
+ *
+ * @param sourceType
+ * @param state
+ * @param minTime
+ * -鏈�澶у垱寤烘椂闂�
+ * @param maxTime
+ * -鏈�灏忓垱寤烘椂闂�
+ * @return
+ */
+ List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
+ @Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
+ @Param("start") long start, @Param("count") int count);
}
\ No newline at end of file
--
Gitblit v1.8.0