From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java | 220 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 125 insertions(+), 95 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java
index 84d2f6b..cddb29f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java
@@ -1,95 +1,125 @@
-package com.yeshi.fanli.dao.mybatis.order;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.order.CommonOrder;
-import com.yeshi.fanli.entity.order.HongBaoOrder;
-
-public interface HongBaoOrderMapper extends BaseMapper<HongBaoOrder> {
-
- /**
- * 鏍规嵁璁㈠崟ID鏌ヨ瀵硅薄
- *
- * @param id
- * @return
- */
- HongBaoOrder selectByCommonOrderId(Long id);
-
- /**
- * 鏍规嵁绾㈠寘ID鏌ヨ瀵硅薄
- *
- * @param id
- * @return
- */
- HongBaoOrder selectByHongBaoId(Long id);
-
- /**
- * 杩斿埄璁㈠崟鍒楄〃锛�1.4.9涔嬪墠锛�
- *
- * @param uid
- * @param start
- * @param count
- * @return
- */
- List<HongBaoOrder> listFanLiOrder(@Param("uid") Long uid, @Param("start") long start, @Param("count") int count);
-
- /**
- * 杩斿埄璁㈠崟鏁伴噺锛�1.4.9涔嬪墠锛�
- *
- * @param uid
- * @return
- */
- Long countFanLiOrder(Long uid);
-
- /**
- * 鏍规嵁璁㈠崟鍙蜂笌绾㈠寘绫诲瀷璁＄畻璁㈠崟鏁伴噺
- *
- * @param orderNo
- * @param type
- * @return
- */
- long countByOrderNoAndHongBaoType(@Param("orderNo") String orderNo, @Param("type") int type,
- @Param("sourceType") int sourceType);
-
- /**
- * 杩斿埄瓒呰繃100鐨勶紝涓旀渶灏忔椂闂�
- *
- * @param uid
- * @param minTime
- * @return
- */
- public int countOrderCountMoneyMoreByUidAndMinTime(@Param("uid") Long uid, @Param("minTime") Date minTime,
- @Param("money") BigDecimal money);
-
- /**
- * 缁存潈璁㈠崟鏁伴噺锛堝寘鍚個璇疯禋锛�
- *
- * @param uid
- * @return
- */
- public int countWeiQuanOrderByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);
-
- /**
- * 缁存潈璁㈠崟杩旇繕鐨勯噾棰�
- *
- * @param uid
- * @return
- */
- public BigDecimal sumWeiQuanOrderFanAmountByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);
-
- /**
- * 缁存潈璁㈠崟鏁伴噺
- * @param uid
- * @param minMoney
- * @param minTime
- * @return
- */
- public int countWeiQuanOrderWithMinCommision(@Param("uid")Long uid,@Param("minMoney") BigDecimal minMoney,@Param("minTime") Date minTime);
-
-}
\ No newline at end of file
+package com.yeshi.fanli.dao.mybatis.order;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.order.HongBaoOrder;
+
+public interface HongBaoOrderMapper extends BaseMapper<HongBaoOrder> {
+
+ /**
+ * 鏍规嵁璁㈠崟ID鏌ヨ瀵硅薄
+ *
+ * @param id
+ * @return
+ */
+ HongBaoOrder selectByCommonOrderId(Long id);
+
+ /**
+ * 鏍规嵁绾㈠寘ID鏌ヨ瀵硅薄
+ *
+ * @param id
+ * @return
+ */
+ HongBaoOrder selectByHongBaoId(Long id);
+
+ /**
+ * 杩斿埄璁㈠崟鍒楄〃锛�1.4.9涔嬪墠锛�
+ *
+ * @param uid
+ * @param start
+ * @param count
+ * @return
+ */
+ List<HongBaoOrder> listFanLiOrder(@Param("uid") Long uid, @Param("start") long start, @Param("count") int count);
+
+ /**
+ * 杩斿埄璁㈠崟鏁伴噺锛�1.4.9涔嬪墠锛�
+ *
+ * @param uid
+ * @return
+ */
+ Long countFanLiOrder(Long uid);
+
+ /**
+ * 鏍规嵁璁㈠崟鍙蜂笌绾㈠寘绫诲瀷璁＄畻璁㈠崟鏁伴噺
+ *
+ * @param orderNo
+ * @param type
+ * @return
+ */
+ long countByOrderNoAndHongBaoType(@Param("orderNo") String orderNo, @Param("type") int type,
+ @Param("sourceType") int sourceType);
+
+ /**
+ * 杩斿埄瓒呰繃100鐨勶紝涓旀渶灏忔椂闂�
+ *
+ * @param uid
+ * @param minTime
+ * @return
+ */
+ public int countOrderCountMoneyMoreByUidAndMinTime(@Param("uid") Long uid, @Param("minTime") Date minTime,
+ @Param("money") BigDecimal money);
+
+ /**
+ * 缁存潈璁㈠崟鏁伴噺锛堝寘鍚個璇疯禋锛�
+ *
+ * @param uid
+ * @return
+ */
+ public int countWeiQuanOrderByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);
+
+ /**
+ * 缁存潈璁㈠崟杩旇繕鐨勯噾棰�
+ *
+ * @param uid
+ * @return
+ */
+ public BigDecimal sumWeiQuanOrderFanAmountByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);
+
+ /**
+ * 缁存潈璁㈠崟鏁伴噺
+ * @param uid
+ * @param minMoney
+ * @param minTime
+ * @return
+ */
+ public int countWeiQuanOrderWithMinCommision(@Param("uid")Long uid,@Param("minMoney") BigDecimal minMoney,@Param("minTime") Date minTime);
+
+
+ /**
+ * 鏍规嵁璁㈠崟ID涓庢潵婧愮被鍨嬫煡璇�
+ * @param orderId
+ * @param sourceType
+ * @return
+ */
+ public List<HongBaoOrder> listByOrderIdAndSourceType(@Param("orderId") String orderId,
+ @Param("sourceType") int sourceType);
+
+
+ /**
+ * 鏍规嵁璁㈠崟ID涓庢潵婧愮被鍨嬫煡璇㈣鎯�
+ * @param orderId
+ * @param sourceType
+ * @return
+ */
+ public List<HongBaoOrder> listDetailByOrderIdAndSourceType(@Param("orderId") String orderId,
+ @Param("sourceType") int sourceType);
+
+
+
+ /**
+ * 鏍规嵁璁㈠崟ID涓庢潵婧愮被鍨嬫煡璇㈣鎯�
+ * @param orderId
+ * @param sourceType
+ * @return
+ */
+ public List<HongBaoOrder> listDetailByOrderIdAndSourceTypeAndUid(@Param("orderId") String orderId,
+ @Param("sourceType") int sourceType, @Param("uid") long uid);
+}
+
+
--
Gitblit v1.8.0