From bf5c02aaecb3f7a42daa4fa356c62a2e6bca0db5 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 28 十月 2019 09:55:59 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java | 18 +++++++++++++++++- 1 files changed, 17 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..135dc2c 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 @@ -30,9 +30,10 @@ * 璁㈠崟瀵硅薄 * @param type * 绫诲瀷 + * @return 0-鏈坊鍔犱篃鏈洿鏂� 1-鍙坊鍔� 2-鍙洿鏂� 12-鏈夋坊鍔犱篃鏈夋洿鏂� * @throws HongBaoException */ - public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException; + public int addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException; /** * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級 @@ -131,6 +132,14 @@ public List<HongBaoV2> listChildrenById(Long id); /** + * 鏌ヨ瀛愮孩鍖� + * + * @param idList + * @return + */ + public List<HongBaoV2> listChildrenByIds(List<Long> idList); + + /** * 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛 * * @return @@ -164,4 +173,11 @@ */ public HongBaoV2 getFirstValidHongBaoByTypeAndUid(List<Integer> typeList, Long uid); + /** + * 鏍规嵁ID鎵归噺鏌ヨ + * + * @param idList + * @return + */ + public List<HongBaoV2> listByIds(List<Long> idList); } -- Gitblit v1.8.0