From f0f94a69b05dd6049e1b3dff2ef3f7a9ac8332fb Mon Sep 17 00:00:00 2001
From: yujian <Administrator@Admin>
Date: 星期三, 26 十二月 2018 14:14:10 +0800
Subject: [PATCH] 订单接口优化
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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 3a8c84e..6554b5f 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,8 +20,9 @@
* @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("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);
/**
@@ -32,8 +33,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("type") Integer type,@Param("orderState")Integer orderState,@Param("orderNo")String orderNo,
+ @Param("startTime")String startTime, @Param("endTime")String endTime,@Param("day")Integer day);
/**
* 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
@@ -49,22 +50,6 @@
*/
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
@@ -72,4 +57,19 @@
*/
Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
@Param("startTime")String startTime, @Param("endTime")String endTime);
+
+ /**
+ * 濂栭噾璁㈠崟鏁伴噺
+ * @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);
+
}
\ No newline at end of file
--
Gitblit v1.8.0