From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

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

--
Gitblit v1.8.0