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 |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 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 8d1289e..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
@@ -5,12 +5,14 @@
 
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.order.CommonOrder;
 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.HongBaoException;
-import com.yeshi.fanli.exception.OrderItemException;
-import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
+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;
 
 /**
  * 璁㈠崟澶勭悊鏈嶅姟
@@ -97,8 +99,40 @@
 
 	/**
 	 * 澶勭悊鎷煎澶氳鍗�
+	 * 
 	 * @param pddOrder
 	 */
 	public void processPDDOrder(PDDOrder pddOrder);
 
+	/**
+	 * 鏍规嵁娣樺疂璁㈠崟鐨勬帓搴忓�间慨澶嶅父瑙勮鍗曠殑鎺掑簭鍊�
+	 * 
+	 * @param orderId
+	 */
+	public void repairCommonOrderByByTaoBaoOrder(String orderId);
+
+	/**
+	 * 鏄惁鏄垎浜禋璁㈠崟
+	 * 
+	 * @param commonOrder
+	 * @return
+	 */
+	public boolean isShareOrder(CommonOrder commonOrder);
+
+	/**
+	 * 澶勭悊娣樺疂鍟嗗鏈粯娆剧殑鎯呭喌
+	 */
+	public void doTaoBaoSellerNotPaid(TaoBaoOrder order);
+
+	/**
+	 * 鑾峰彇鍙互杩斿埄鐨勯タ浜嗕箞绾㈠寘
+	 * @return
+	 */
+	public List<HongBaoV2> getCanBalanceElmeFanliHongBao();
+
+	/**
+	 * 楗夸簡涔堣繑鍒�
+	 * @param hongBaoId
+	 */
+	public void elmeFanli(Long hongBaoId);
 }

--
Gitblit v1.8.0