From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 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