From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java
index f14ca5f..2e52482 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java
@@ -5,9 +5,11 @@
import java.util.List;
import com.yeshi.fanli.dto.HongBaoDTO;
+import com.yeshi.fanli.dto.order.HongBaoAddResult;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.exception.order.HongBaoException;
+import com.yeshi.fanli.exception.user.UserAccountException;
public interface HongBaoV2Service {
@@ -30,9 +32,10 @@
* 璁㈠崟瀵硅薄
* @param type
* 绫诲瀷
+ * @return 0-鏈坊鍔犱篃鏈洿鏂� 1-鍙坊鍔� 2-鍙洿鏂� 12-鏈夋坊鍔犱篃鏈夋洿鏂�
* @throws HongBaoException
*/
- public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException;
+ public HongBaoAddResult addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException,UserAccountException ;
/**
* 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級
@@ -131,6 +134,14 @@
public List<HongBaoV2> listChildrenById(Long id);
/**
+ * 鏌ヨ瀛愮孩鍖�
+ *
+ * @param idList
+ * @return
+ */
+ public List<HongBaoV2> listChildrenByIds(List<Long> idList);
+
+ /**
* 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛
*
* @return
@@ -164,4 +175,25 @@
*/
public HongBaoV2 getFirstValidHongBaoByTypeAndUid(List<Integer> typeList, Long uid);
+ /**
+ * 鏍规嵁ID鎵归噺鏌ヨ
+ *
+ * @param idList
+ * @return
+ */
+ public List<HongBaoV2> listByIds(List<Long> idList);
+
+ /**
+ * 鏍规嵁浜ゆ槗id鏌ヨ绾㈠寘淇℃伅
+ * @param tradeId
+ * @return
+ */
+ public List<HongBaoDTO> listByOrderTradeId(String tradeId);
+
+ /**
+ * 鏌ヨ鐩存帴涓婄骇褰撴椂鑾峰緱绾㈠寘绛夌骇
+ * @param pid
+ * @return
+ */
+ public Integer getDirectBossUrankByPid(Long pid);
}
--
Gitblit v1.8.0