From f7ed4e6bbe9be95d268481e66d70d90e70e07e12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 一月 2019 19:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 78 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 2 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 2efbbb6..b2da8c8 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
@@ -39,7 +39,15 @@
@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
-
+ /**
+ * 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
+ * @param uid
+ * @param orderNo
+ * @return
+ */
+ CommonOrderVO getBuFenOrderState(@Param("uid") Long uid, @Param("orderNo") String orderNo);
+
+
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲�
*
@@ -95,7 +103,20 @@
BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
@Param("startTime") String startTime, @Param("endTime") String endTime);
-
+
+ /**
+ * 濂栭噾缁熻
+ *
+ * @param uid
+ * @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);
+
+
+
+
+
int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
@@ -113,5 +134,58 @@
*/
CommonOrder selectByOrderNoAndOrderTypeAndOrderBy(@Param("orderNo") String orderNo,
@Param("orderType") int orderType, @Param("orderBy") int orderBy);
+
+
+ /**
+ * 璁㈠崟鍒楄〃鏌ヨ
+ * @param start
+ * @param count
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<CommonOrderVO> listQueryByUid(@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);
+
+ /**
+ * 缁熻
+ */
+ long countQueryByUid(@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 start
+ * @param count
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ 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);
+
+ /**
+ * 缁熻
+ */
+ 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);
+
}
\ No newline at end of file
--
Gitblit v1.8.0