From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期四, 23 四月 2020 10:00:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java index 583cee5..050eebd 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java @@ -1,6 +1,10 @@ package com.yeshi.fanli.service.inter.order; +import java.util.Date; + +import com.yeshi.fanli.exception.ParamsException; import com.yeshi.fanli.exception.money.OrderMoneySettleException; +import com.yeshi.fanli.exception.money.TeamEincomeRecordException; /** * 璁㈠崟璧勯噾缁撶畻鏈嶅姟 @@ -15,22 +19,22 @@ * * @param uid */ - public void inviteSettleTB(Long uid) throws OrderMoneySettleException; + public void inviteSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException; - public void inviteSettleJD(Long uid) throws OrderMoneySettleException; + public void inviteSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException; - public void inviteSettlePDD(Long uid) throws OrderMoneySettleException; + public void inviteSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException; /** * 鍒嗕韩璧氱粨绠� * * @param uid */ - public void shareSettleTB(Long uid) throws OrderMoneySettleException; + public void shareSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException; - public void shareSettleJD(Long uid) throws OrderMoneySettleException; + public void shareSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException; - public void shareSettlePDD(Long uid) throws OrderMoneySettleException; + public void shareSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException; /** * 鑷喘缁撶畻 @@ -46,15 +50,7 @@ * @param taskKey * @throws OrderMoneySettleException */ - public void inviteSubsidySettle(Long uid, String taskKey) throws OrderMoneySettleException; + public void inviteSubsidySettle(Long uid, String taskKey, Date maxPreGetTime) + throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException; - /** - * 鍥㈤槦濂栧姳鍒拌处 - * @Title: orderTeamRewardSettle - * @Description: - * @param uid - * void 杩斿洖绫诲瀷 - * @throws - */ - public void orderTeamRewardSettle(Long uid) throws OrderMoneySettleException; } -- Gitblit v1.8.0