From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 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 6877f67..f9c9cb7 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
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -7,8 +8,10 @@
 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.suning.SuningOrderInfo;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.entity.vipshop.VipShopOrder;
 import com.yeshi.fanli.exception.order.HongBaoException;
 import com.yeshi.fanli.exception.order.OrderItemException;
 import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
@@ -60,20 +63,25 @@
 	 */
 	public void fanli(HongBaoV2 hongBao) throws TaoBaoWeiQuanException;
 
-	/**
-	 * 閭�璇疯禋杩斿埄
-	 * 
-	 * @param hongBao
-	 *            type=1涓旀湁瀛愮孩鍖呯殑涓荤孩鍖�
-	 * 
-	 */
-	public void fanliInvaiteAndShare();
+	
+	public void fanliPreInvaite(Date maxTime);
+	
+	public void fanliShare(Date maxTime);
 
 	/**
-	 * 鍒嗕韩璧氫笌閭�璇疯禋杩斿埄
+	 * 缁撶畻鍥㈤槦濂栭噾+琛ヨ创
+	 * @Title: fanliInvaite
+	 * @Description: 
+	 * @param maxPreGetTime 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
 	 */
-	public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException;
 
+	public void fanliPreInvaite(Long uid, Date maxPreGetTime);
+	
+	
+	public void fanliShare(Long uid, Date maxPreGetTime);
+	
 	/**
 	 * 璁㈠崟缁存潈
 	 * 
@@ -102,6 +110,22 @@
 	 * @param pddOrder
 	 */
 	public void processPDDOrder(PDDOrder pddOrder);
+	
+	/**
+	 * 澶勭悊鍞搧浼氳鍗�
+	 * 
+	 * @param vipShopOrder
+	 */
+	public void processVipShopOrder(VipShopOrder vipShopOrder);
+	
+	
+	/**
+	 * 澶勭悊鑻忓畞璁㈠崟
+	 * 
+	 * @param suningOrder
+	 */
+	public void processSuningOrder(SuningOrderInfo suningOrder);
+
 
 	/**
 	 * 鏍规嵁娣樺疂璁㈠崟鐨勬帓搴忓�间慨澶嶅父瑙勮鍗曠殑鎺掑簭鍊�

--
Gitblit v1.8.0