From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 74 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 12 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..b276c2e 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
@@ -25,7 +25,7 @@
List<CommonOrderVO> listUserOrder(@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("source")Integer source);
+ @Param("day") Integer day, @Param("source") Integer source);
/**
* 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -37,7 +37,8 @@
*/
long countUserOrder(@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("source")Integer source);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
+ @Param("source") Integer source);
/**
* 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
@@ -75,7 +76,8 @@
* @param uid
* @return
*/
- Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day, @Param("source") Integer source);
+ Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day,
+ @Param("source") Integer source);
/**
* 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -84,8 +86,8 @@
* @return
*/
Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
- @Param("source")Integer source);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
+ @Param("source") Integer source);
/**
* 濂栭噾璁㈠崟鏁伴噺
@@ -94,7 +96,7 @@
* @return
*/
long countBonusOrderNumber(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
/**
* 濂栭噾缁熻
@@ -103,7 +105,7 @@
* @return
*/
BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
/**
* 濂栭噾缁熻
@@ -112,7 +114,8 @@
* @return
*/
Map<String, Object> countBonusOrderMoneyAndNumber(@Param("uid") Long uid, @Param("type") Integer type,
- @Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("source") Integer source);
int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
@@ -171,14 +174,38 @@
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);
+
+ /**
+ * 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
+ *
+ * @param start
+ * @param count
+ * @param keyType
+ * @param key
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @param source
+ * @return
+ */
+ List<CommonOrderVO> listQueryWithNoChild(@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);
/**
* 缁熻
*/
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);
+
+ long countQueryWithNoChild(@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);
/**
* 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃
@@ -209,15 +236,38 @@
* @return
*/
CommonOrderVO getCommonOrderByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo,
- @Param("orderState") Integer orderState);
+ @Param("orderState") Integer orderState, @Param("sourceType") Integer sourceType);
/**
* 鏍规嵁鏉ユ簮鍜屼氦鏄揑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