From c57f9a24c525aa557225b663fa55120a36f99735 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 16 四月 2020 15:52:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 39ba64c..1d41097 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
@@ -6,7 +6,6 @@
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 {
@@ -22,6 +21,9 @@
public List<InviteOrderSubsidy> listByOrderNoAndType(String orderNo, Integer type);
+
+
+ public List<InviteOrderSubsidy> listByOrderNoAndTypeAndUid(String orderNo, Integer type,Long uid);
/**
* 鏌ヨ琛ヨ创锛堝姞閿侊級
@@ -39,7 +41,7 @@
* @param sourceType
*/
public void addOrUpdateByOrder(String orderId, int sourceType)
- throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException;
+ throws InviteOrderSubsidyException, CommonOrderException;
/**
* 鏍规嵁璁㈠崟鍙蜂笌鏉ユ簮鏌ヨ
--
Gitblit v1.8.0