From f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 十二月 2018 15:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 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 c476678..a7d1084 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
@@ -20,9 +20,11 @@
* @param uid
* @return
*/
+
List<CommonOrderVO> listGroupOrderNoByUid(@Param("start") long start, @Param("count") int count,
@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
- @Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
/**
* 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -33,7 +35,8 @@
* @return
*/
long countGroupOrderNoByUid(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
- @Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
/**
* 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
@@ -53,37 +56,32 @@
Map<String, BigDecimal> countOrderByHongBaoType(@Param("uid") Long uid, @Param("day") Integer day);
/**
- * 鎬昏鍗�
- *
- * @param uid
- * @return
- */
- long countOrder(@Param("uid") Long uid, @Param("isToday") Integer isToday);
-
- /**
- * 鎬昏鍗�
- *
- * @param uid
- * @return
- */
- BigDecimal countOrderMoney(@Param("uid") Long uid, @Param("isToday") Integer isToday);
-
- /**
* 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
*
* @param uid
* @return
*/
Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
+
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
- * 鏍规嵁璁㈠崟鍙峰拰璁㈠崟绫诲瀷鏌ヨ鏁伴噺
+ * 濂栭噾璁㈠崟鏁伴噺
*
- * @param orderNO
- * @param orderType
+ * @param uid
* @return
*/
+ long countBonusOrder(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day);
+
+ /**
+ * 濂栭噾缁熻
+ *
+ * @param uid
+ * @return
+ */
+ BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day);
+
+
int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
}
\ No newline at end of file
--
Gitblit v1.8.0