From c88ff8bfc667d4af060792d60fc907d3a62d87ab Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 08:58:59 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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..0625032 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
@@ -4,7 +4,7 @@
 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.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
 import com.yeshi.fanli.exception.HongBaoException;
@@ -31,8 +31,6 @@
 	 */
 	public void processShopingFanliOrder(Map<String, List<TaoBaoOrder>> orders);
 
-	public void processShopingFanliOrder(String orderId, List<TaoBaoOrder> orderList)
-			throws HongBaoException, OrderItemException;
 
 	/**
 	 * 澶勭悊鍒嗕韩鍟嗗搧璁㈠崟
@@ -57,13 +55,14 @@
 	 */
 	public void fanli();
 
+
+	
 	/**
 	 * 璐墿杩斿埄
-	 * 
-	 * @param hongBao
-	 *            type=1鐨勪富绾㈠寘
+	 * @param hongBao  type=1鐨勪富绾㈠寘
+	 * @throws TaoBaoWeiQuanException
 	 */
-	public void fanli(HongBao hongBao) throws TaoBaoWeiQuanException;
+	public void fanli(HongBaoV2 hongBao) throws TaoBaoWeiQuanException;
 
 	/**
 	 * 閭�璇疯禋杩斿埄

--
Gitblit v1.8.0