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/impl/user/integral/IntegralDetailServiceImpl.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralDetailServiceImpl.java index 9103a78..e93a06b 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralDetailServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralDetailServiceImpl.java @@ -14,9 +14,12 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.yeshi.fanli.dao.mybatis.integral.IntegralDetailMapper; +import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.integral.IntegralDetail; +import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.vo.integral.IntegralDetailVO; @@ -27,6 +30,9 @@ @Resource private IntegralDetailMapper integralDetailMapper; + + @Resource + private UserInfoExtraService userInfoExtraService; @Override public void insertSelective(IntegralDetail record) { @@ -191,5 +197,32 @@ return monthCount + detailCount; } + + @Override + public BigDecimal getCumulativeMoney(Long uid) { + return integralDetailMapper.getCumulativeMoney(uid); + } + + + @Override + public Long countNewAddByDate(String preDay) { + return integralDetailMapper.countNewAddByDate(preDay); + } + + @Override + public List<IntegralDetail> listQuery(long start, int count, String key) { + return integralDetailMapper.listQuery(start, count, key); + } + + @Override + public long countQuery(String key) { + Long count = integralDetailMapper.countQuery(key); + if (count == null) { + count = 0L; + } + return count; + } + + } -- Gitblit v1.8.0