From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 c446e29..d58a8ac 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
@@ -37,7 +37,20 @@
 	/**
 	 * 澶勭悊鍒嗕韩鍟嗗搧璁㈠崟
 	 */
-	public void processShareGoodsOrder(Map<String, List<PidOrder>> orders);
+	public void processShareGoodsOrder(Map<String, List<TaoBaoOrder>> orders);
+	
+	
+	
+	
+	public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
+			throws HongBaoException, OrderItemException;
+
+	/**
+	 * 澶勭悊鍒嗕韩鍟嗗搧璁㈠崟
+	 */
+	public void processShareGoodsOrderNew(String orderId, List<TaoBaoOrder> orderList);
+
+	
 
 	/**
 	 * 澶勭悊杩斿埄

--
Gitblit v1.8.0