From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyService.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyService.java
index d72aa5d..39ba64c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyService.java
@@ -1,9 +1,12 @@
package com.yeshi.fanli.service.inter.order;
import java.math.BigDecimal;
+import java.util.List;
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 InviteOrderSubsidyService {
@@ -16,6 +19,9 @@
* @return
*/
public InviteOrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type);
+
+
+ public List<InviteOrderSubsidy> listByOrderNoAndType(String orderNo, Integer type);
/**
* 鏌ヨ琛ヨ创锛堝姞閿侊級
@@ -25,8 +31,6 @@
* @return
*/
public InviteOrderSubsidy getByOrderNoAndTypeForUpdate(Long uid, String orderNo, Integer type);
-
-
/**
* 娣诲姞鎴栦慨鏀癸紙鎸夌収璁㈠崟鍙蜂笌鏉ユ簮锛�
@@ -34,7 +38,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 +58,36 @@
*/
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);
+
+ /**
+ * 缁熻宸插埌璐﹂噾棰�
+ * @param uid
+ * @param level
+ * @return
+ */
+ public BigDecimal sumRecievedMoneyByUid(long uid, Integer level);
+
+ /**
+ * 缁熻鏈夋晥閲戦
+ * @param uid
+ * @param day
+ * @param level
+ * @return
+ */
+ public BigDecimal sumValidMoneyByUidAndDate(long uid, Integer day, Integer level);
+
+ public BigDecimal sumMoneyByUidAndDateAndState(long uid, Integer day, Integer level, Integer state);
}
--
Gitblit v1.8.0