From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 12 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 53be87c..cf06046 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,10 +1,12 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 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.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -59,20 +61,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);
+	
 	/**
 	 * 璁㈠崟缁存潈
 	 * 
@@ -97,15 +104,40 @@
 
 	/**
 	 * 澶勭悊鎷煎澶氳鍗�
+	 * 
 	 * @param pddOrder
 	 */
 	public void processPDDOrder(PDDOrder pddOrder);
-	
-	
+
 	/**
 	 * 鏍规嵁娣樺疂璁㈠崟鐨勬帓搴忓�间慨澶嶅父瑙勮鍗曠殑鎺掑簭鍊�
+	 * 
 	 * @param orderId
 	 */
 	public void repairCommonOrderByByTaoBaoOrder(String orderId);
 
+	/**
+	 * 鏄惁鏄垎浜禋璁㈠崟
+	 * 
+	 * @param commonOrder
+	 * @return
+	 */
+	public boolean isShareOrder(CommonOrder commonOrder);
+
+	/**
+	 * 澶勭悊娣樺疂鍟嗗鏈粯娆剧殑鎯呭喌
+	 */
+	public void doTaoBaoSellerNotPaid(TaoBaoOrder order);
+
+	/**
+	 * 鑾峰彇鍙互杩斿埄鐨勯タ浜嗕箞绾㈠寘
+	 * @return
+	 */
+	public List<HongBaoV2> getCanBalanceElmeFanliHongBao();
+
+	/**
+	 * 楗夸簡涔堣繑鍒�
+	 * @param hongBaoId
+	 */
+	public void elmeFanli(Long hongBaoId);
 }

--
Gitblit v1.8.0