From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 13 三月 2019 12:02:16 +0800 Subject: [PATCH] 正式数据库修改 --- fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 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..6dbb2a3 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 @@ -4,6 +4,8 @@ import java.util.Date; import java.util.List; +import org.apache.ibatis.annotations.Param; + import com.yeshi.fanli.dto.HongBaoDTO; import com.yeshi.fanli.entity.bus.user.HongBao; import com.yeshi.fanli.entity.bus.user.HongBaoV2; @@ -35,12 +37,6 @@ */ public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException; - /** - * 灏嗚�佺増鏈殑绾㈠寘瀵硅薄杞负鏂扮増鏈殑瀵硅薄 - * - * @param hb - */ - public void convert(HongBao hb); /** * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級 @@ -84,8 +80,7 @@ * @return */ BigDecimal getUnGetTiChengMoney(Long uid); - - + /** * 鑾峰彇鎬诲叡杩斿埄閲戦 * @@ -101,14 +96,25 @@ * @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); } -- Gitblit v1.8.0