From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java |  122 ++++++++++++++++++++++++++++++++--------
 1 files changed, 98 insertions(+), 24 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 7843655..890df2e 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,14 +1,20 @@
 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.suning.SuningOrderInfo;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.HongBaoException;
-import com.yeshi.fanli.exception.OrderItemException;
-import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
+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;
 
 /**
  * 璁㈠崟澶勭悊鏈嶅姟
@@ -30,15 +36,11 @@
 	 */
 	public void processShopingFanliOrder(Map<String, List<TaoBaoOrder>> orders);
 
-
 	/**
 	 * 澶勭悊鍒嗕韩鍟嗗搧璁㈠崟
 	 */
 	public void processShareGoodsOrder(Map<String, List<TaoBaoOrder>> orders);
-	
-	
-	
-	
+
 	public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
 			throws HongBaoException, OrderItemException;
 
@@ -47,36 +49,39 @@
 	 */
 	public void processShareGoodsOrderNew(String orderId, List<TaoBaoOrder> orderList);
 
-	
-
 	/**
 	 * 澶勭悊杩斿埄
 	 */
 	public void fanli();
 
-
-	
 	/**
 	 * 璐墿杩斿埄
-	 * @param hongBao  type=1鐨勪富绾㈠寘
+	 * 
+	 * @param hongBao
+	 *            type=1鐨勪富绾㈠寘
 	 * @throws TaoBaoWeiQuanException
 	 */
 	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);
+	
 	/**
 	 * 璁㈠崟缁存潈
 	 * 
@@ -86,10 +91,79 @@
 	public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList);
 
 	/**
+	 * 杩囨椂
 	 * 鍗曚釜璁㈠崟缁存潈
 	 * 
 	 * @param order
 	 */
-	public void weiQuanOrder(TaoBaoWeiQuanOrder order) ;
+	public void weiQuanOrder(TaoBaoWeiQuanOrder order);
+
+	/**
+	 * 澶勭悊浜笢璁㈠崟
+	 * 
+	 * @param order
+	 */
+	public void processJDOrder(JDOrder order);
+
+	/**
+	 * 澶勭悊鎷煎澶氳鍗�
+	 * 
+	 * @param pddOrder
+	 */
+	public void processPDDOrder(PDDOrder pddOrder);
 	
+	/**
+	 * 澶勭悊鍞搧浼氳鍗�
+	 * 
+	 * @param vipShopOrder
+	 */
+	public void processVipShopOrder(VipShopOrder vipShopOrder);
+	
+	
+	/**
+	 * 澶勭悊鑻忓畞璁㈠崟
+	 * 
+	 * @param suningOrder
+	 */
+	public void processSuningOrder(SuningOrderInfo suningOrder);
+
+
+	/**
+	 * 鏍规嵁娣樺疂璁㈠崟鐨勬帓搴忓�间慨澶嶅父瑙勮鍗曠殑鎺掑簭鍊�
+	 * 
+	 * @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);
+
+
+	/**
+	 * 浣挎窐瀹濊鍗曞け鏁�
+	 * @param tradeId
+	 */
+	public void invalidTaoBaoOrder(String tradeId);
 }

--
Gitblit v1.8.0