From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java |   17 +++++++++++++++++
 1 files changed, 17 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..b1b7000 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,21 @@
 	 * @return
 	 */
 	public long countFanLiOrder(Long uid);
+
+	/**
+	 * 鏍规嵁璁㈠崟鍙峰拰璁㈠崟鏉ユ簮鑾峰彇鏁伴噺
+	 * 
+	 * @param orderNo
+	 * @param type
+	 * @return
+	 */
+	public long countByOrderNoAndHongBaoType(String orderNo, int type);
+	
+	/**
+	 * 鑾峰彇璇︽儏
+	 * @param commonOrderId
+	 * @return
+	 */
+	public HongBaoOrder selectDetailByCommonOrderId(Long commonOrderId);
+
 }

--
Gitblit v1.8.0