From 4fe5f879c1b2919099a6e193ab4db8d25725ca40 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 10:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java
index 96913e0..0ae9216 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java
@@ -1,5 +1,8 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.math.BigDecimal;
+import java.util.Map;
+
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.Order;
 
@@ -19,4 +22,12 @@
 	 */
 	public void addOrderHongBaoMap(HongBaoV2 hongBao, Order order);
 
+	/**
+	 * 鏌ユ壘濂栧姳閲戦
+	 * @param orderNo
+	 * @param uid
+	 * @return
+	 */
+	public Map<String, BigDecimal> getCouponHongbaoByOrderNo(String orderNo, Long uid);
+
 }

--
Gitblit v1.8.0