From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyServiceV2.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyServiceV2.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyServiceV2.java
index f558bde..ed73dd0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyServiceV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyServiceV2.java
@@ -3,7 +3,9 @@
import java.math.BigDecimal;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
+import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
+import com.yeshi.fanli.exception.order.OrderTeamRewardException;
public interface InviteOrderSubsidyServiceV2 {
@@ -25,8 +27,6 @@
* @return
*/
public InviteOrderSubsidy getByOrderNoAndTypeForUpdate(Long uid, String orderNo, Integer type);
-
-
/**
* 娣诲姞鎴栦慨鏀癸紙鎸夌収璁㈠崟鍙蜂笌鏉ユ簮锛�
@@ -34,7 +34,8 @@
* @param orderId
* @param sourceType
*/
- public void addOrUpdateByOrder(String orderId, int sourceType) throws InviteOrderSubsidyException;
+ public void addOrUpdateByOrder(String orderId, int sourceType)
+ throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException;
/**
* 鏍规嵁璁㈠崟鍙蜂笌鏉ユ簮鏌ヨ
@@ -53,19 +54,17 @@
*/
public void invalidByOrderIdAndSourceType(String orderId, int sourceType);
-
/**
* 浣胯鍗曞彿瀵瑰簲鐨勬暟鎹湁鏁�
* @param orderId
* @param sourceType
*/
- public void validByOrderIdAndSourceType(String orderId, int sourceType);
-
-
+ public void validByOrderIdAndSourceType(String orderId, int sourceType) throws InviteOrderSubsidyException;
+
/**
* 缁撶畻閲戦
* @param id
* @param money
*/
- public void settleById(Long id,BigDecimal money);
+ public void settleById(Long id, BigDecimal money);
}
--
Gitblit v1.8.0