From f4d4486e55b91ab2d6313c48dbe8500c3928e8fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   13 ++++++++++++-
 1 files changed, 12 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 7458f85..6f9321d 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;
 
@@ -9,7 +10,6 @@
 import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.money.OrderMoneySettleException;
 import com.yeshi.fanli.exception.order.HongBaoException;
 import com.yeshi.fanli.exception.order.OrderItemException;
 import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
@@ -71,6 +71,17 @@
 	public void fanliInvaiteAndShare();
 
 	/**
+	 * 缁撶畻鍥㈤槦鏀剁泭
+	 * @Title: fanliInvaite
+	 * @Description: 
+	 * @param maxPreGetTime 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+
+	public void fanliPreInvaite(Long uid, Date maxPreGetTime);
+
+	/**
 	 * 鍒嗕韩璧氫笌閭�璇疯禋杩斿埄
 	 */
 	public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException;

--
Gitblit v1.8.0