From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 27 八月 2019 12:32:46 +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/hongbao/HongBaoV2Service.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 46 insertions(+), 13 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java index 7c20f54..5e34c9b 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java @@ -5,7 +5,6 @@ import java.util.List; import com.yeshi.fanli.dto.HongBaoDTO; -import com.yeshi.fanli.entity.bus.user.HongBao; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.exception.HongBaoException; @@ -34,13 +33,6 @@ * @throws HongBaoException */ public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException; - - /** - * 灏嗚�佺増鏈殑绾㈠寘瀵硅薄杞负鏂扮増鏈殑瀵硅薄 - * - * @param hb - */ - public void convert(HongBao hb); /** * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級 @@ -84,8 +76,7 @@ * @return */ BigDecimal getUnGetTiChengMoney(Long uid); - - + /** * 鑾峰彇鎬诲叡杩斿埄閲戦 * @@ -101,14 +92,56 @@ * @return */ BigDecimal getUnRecievedFanLiMoney(Long uid); - + /** - * 灏氭湭鍒拌处鐨勯噾棰� + * 灏氭湭鍒拌处鐨勯噾棰�(鏍规嵁鍒涘缓鏃堕棿) + * * @param uid * @param minDate * @param maxDate * @return */ - BigDecimal getUnRecievedMoneyWithCreateTime(Long uid,Date minDate,Date maxDate); + BigDecimal getUnRecievedMoneyWithCreateTime(Long uid, Date minDate, Date maxDate); + + /** + * 灏氭湭鍒拌处鐨勯噾棰�(鏍规嵁棰勮棰嗗彇鏃堕棿) + * + * @param uid + * @param minDate + * @param maxDate + * @return + */ + BigDecimal getUnRecievedMoneyWithPreGetTime(Long uid, Date minDate, Date maxDate); + + /** + * 璁＄畻璧勯噾 + * + * @param uid + * @param state + * @return + */ + BigDecimal computeMoneyByUidAndState(Long uid, int state); + + /** + * 鏌ヨ瀛愮孩鍖� + * + * @param id + * @return + */ + public List<HongBaoV2> listChildrenById(Long id); + + /** + * 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛 + * + * @return + */ + public List<Long> getUidByNear30DayShareSucceed(); + + /** + * 璁╅個璇疯禋澶辨晥锛堟牴鎹笅绾х敤鎴稩D锛� + * @param parentUid + * @param beiZhu + */ + public void invalidInviteHongBaoByParentUid(Long parentUid, String beiZhu); } -- Gitblit v1.8.0