From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 24 三月 2020 12:01:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 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 182cd0c..130958e 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 @@ -9,6 +9,7 @@ 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; @@ -75,6 +76,25 @@ public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException; /** + * 鍥㈤槦濂栧姳鍒拌处 + * @Title: fanliOrderTeamReward + * @Description: + * void 杩斿洖绫诲瀷 + * @throws + */ + public void fanliOrderTeamReward(); + + /** + * 鍥㈤槦濂栧姳鍒拌处锛堟寜鐢ㄦ埛锛� + * @Title: fanliOrderTeamReward + * @Description: + * @param uid + * void 杩斿洖绫诲瀷 + * @throws + */ + public void fanliOrderTeamReward(Long uid) throws OrderMoneySettleException; + + /** * 璁㈠崟缁存潈 * * @param orderList @@ -118,4 +138,20 @@ */ 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