From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   78 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 19 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 d58a8ac..6877f67 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
@@ -3,13 +3,15 @@
 import java.util.List;
 import java.util.Map;
 
-import com.yeshi.fanli.entity.bus.user.HongBao;
-import com.yeshi.fanli.entity.taobao.PidOrder;
+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.order.HongBaoException;
+import com.yeshi.fanli.exception.order.OrderItemException;
+import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
 
 /**
  * 璁㈠崟澶勭悊鏈嶅姟
@@ -31,17 +33,11 @@
 	 */
 	public void processShopingFanliOrder(Map<String, List<TaoBaoOrder>> orders);
 
-	public void processShopingFanliOrder(String orderId, List<TaoBaoOrder> orderList)
-			throws HongBaoException, OrderItemException;
-
 	/**
 	 * 澶勭悊鍒嗕韩鍟嗗搧璁㈠崟
 	 */
 	public void processShareGoodsOrder(Map<String, List<TaoBaoOrder>> orders);
-	
-	
-	
-	
+
 	public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
 			throws HongBaoException, OrderItemException;
 
@@ -49,8 +45,6 @@
 	 * 澶勭悊鍒嗕韩鍟嗗搧璁㈠崟
 	 */
 	public void processShareGoodsOrderNew(String orderId, List<TaoBaoOrder> orderList);
-
-	
 
 	/**
 	 * 澶勭悊杩斿埄
@@ -62,22 +56,23 @@
 	 * 
 	 * @param hongBao
 	 *            type=1鐨勪富绾㈠寘
+	 * @throws TaoBaoWeiQuanException
 	 */
-	public void fanli(HongBao hongBao) throws TaoBaoWeiQuanException;
+	public void fanli(HongBaoV2 hongBao) throws TaoBaoWeiQuanException;
 
 	/**
 	 * 閭�璇疯禋杩斿埄
 	 * 
 	 * @param hongBao
 	 *            type=1涓旀湁瀛愮孩鍖呯殑涓荤孩鍖�
-
+	 * 
 	 */
 	public void fanliInvaiteAndShare();
 
 	/**
 	 * 鍒嗕韩璧氫笌閭�璇疯禋杩斿埄
 	 */
-	public void fanliInvaiteAndShare(Long uid)  throws TaoBaoWeiQuanException;
+	public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException;
 
 	/**
 	 * 璁㈠崟缁存潈
@@ -92,6 +87,51 @@
 	 * 
 	 * @param order
 	 */
-	public void weiQuanOrder(TaoBaoWeiQuanOrder order) ;
-	
+	public void weiQuanOrder(TaoBaoWeiQuanOrder order);
+
+	/**
+	 * 澶勭悊浜笢璁㈠崟
+	 * 
+	 * @param order
+	 */
+	public void processJDOrder(JDOrder order);
+
+	/**
+	 * 澶勭悊鎷煎澶氳鍗�
+	 * 
+	 * @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