From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java
index e7905b3..7458f85 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java
@@ -9,6 +9,7 @@
 import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.exception.money.OrderMoneySettleException;
 import com.yeshi.fanli.exception.order.HongBaoException;
 import com.yeshi.fanli.exception.order.OrderItemException;
 import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
@@ -123,4 +124,15 @@
 	 */
 	public void doTaoBaoSellerNotPaid(TaoBaoOrder order);
 
+	/**
+	 * 鑾峰彇鍙互杩斿埄鐨勯タ浜嗕箞绾㈠寘
+	 * @return
+	 */
+	public List<HongBaoV2> getCanBalanceElmeFanliHongBao();
+
+	/**
+	 * 楗夸簡涔堣繑鍒�
+	 * @param hongBaoId
+	 */
+	public void elmeFanli(Long hongBaoId);
 }

--
Gitblit v1.8.0