From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 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 a7d1084..f92fb29 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
@@ -38,6 +38,18 @@
@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
+
+ /**
+ * 缁熻宸插埌璐﹂噾棰� 浠ュ強璁㈠崟鏁伴噺
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+
+ Map<String, Object> countMoneyGroupOrderNoByUid(@Param("uid") Long uid, @Param("type") Integer type, @Param("orderNo") String orderNo,
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
/**
* 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
*
@@ -63,7 +75,7 @@
*/
Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
/**
* 濂栭噾璁㈠崟鏁伴噺
@@ -80,8 +92,21 @@
* @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);
+ /**
+ * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟鎺掑簭鍊艰幏鍙栬鎯�
+ *
+ * @param orderNo
+ * -璁㈠崟鍙�
+ * @param orderBy
+ * -璁㈠崟鎺掑簭鍊�
+ * @param orderType
+ * -璁㈠崟绫诲瀷
+ * @return
+ */
+ CommonOrder selectByOrderNoAndOrderTypeAndOrderBy(@Param("orderNo") String orderNo,
+ @Param("orderType") int orderType, @Param("orderBy") int orderBy);
+
}
\ No newline at end of file
--
Gitblit v1.8.0