From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java
index e02c495..74f50b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java
@@ -36,4 +36,14 @@
 	 * @return
 	 */
 	public long countFanLiOrder(Long uid);
+
+	/**
+	 * 鏍规嵁璁㈠崟鍙峰拰璁㈠崟鏉ユ簮鑾峰彇鏁伴噺
+	 * 
+	 * @param orderNo
+	 * @param type
+	 * @return
+	 */
+	public long countByOrderNoAndHongBaoType(String orderNo, int type);
+
 }

--
Gitblit v1.8.0