From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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..6c3b9f2 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;
@@ -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);
+
+	
 
 	/**
 	 * 澶勭悊杩斿埄
@@ -51,6 +64,14 @@
 	 *            type=1鐨勪富绾㈠寘
 	 */
 	public void fanli(HongBao hongBao) throws TaoBaoWeiQuanException;
+	
+	
+	/**
+	 * 璐墿杩斿埄
+	 * @param hongBao  type=1鐨勪富绾㈠寘
+	 * @throws TaoBaoWeiQuanException
+	 */
+	public void fanli(HongBaoV2 hongBao) throws TaoBaoWeiQuanException;
 
 	/**
 	 * 閭�璇疯禋杩斿埄

--
Gitblit v1.8.0