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 | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 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 6554b5f..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
@@ -11,65 +11,77 @@
import com.yeshi.fanli.vo.order.CommonOrderVO;
public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
-
+
/**
* 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
+ *
* @param start
* @param count
* @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("orderState") Integer orderState, @Param("orderNo")String orderNo,
- @Param("startTime")String startTime, @Param("endTime")String endTime,@Param("day")Integer day);
-
-
+
+ List<CommonOrderVO> listGroupOrderNoByUid(@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 start
* @param count
* @param uid
* @return
*/
- long countGroupOrderNoByUid(@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 countGroupOrderNoByUid(@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 list 璁㈠崟瀵硅薄
+ *
+ * @param list
+ * 璁㈠崟瀵硅薄
* @return
*/
List<CommonOrderVO> listByOrderNoAndType(List<CommonOrderVO> list);
-
+
/**
* 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
+ *
* @param uid
* @return
*/
Map<String, BigDecimal> countOrderByHongBaoType(@Param("uid") Long uid, @Param("day") Integer day);
-
+
/**
* 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
+ *
* @param uid
* @return
*/
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 uid
* @return
*/
- long countBonusOrder(@Param("uid")Long uid, @Param("type") Integer type, @Param("day")Integer day);
-
+ 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);
+ 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