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 | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 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..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,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; @@ -61,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); + /** * 璁㈠崟缁存潈 * -- Gitblit v1.8.0