From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +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/impl/count/HongBaoV2CountServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 3b57c88..312a0bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateUtil;
@@ -19,6 +20,7 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -237,6 +239,11 @@
public int getTotalTiChengCount(Long uid) {
return hongBaoV2CountMapper.getTotalTiChengCount(uid);
}
+
+ @Override
+ public long getHongBaoCount(Long uid,Integer type) {
+ return hongBaoV2CountMapper.getHongBaoCount(uid, type);
+ }
@Override
public long countValidNumberByUid(Long uid, Integer dateType) {
@@ -297,13 +304,56 @@
return hongBaoV2CountMapper.countAlreadyGetMoneyByUid(uid, typeList, minGetTime, maxGetTime);
}
- @Override
+ @Override
public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime) {
return hongBaoV2CountMapper.getOrderRewardByTeamUid(uid, teamUid, endTime);
}
@Override
public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid) {
- return hongBaoV2CountMapper.getOrderRewardByTeamUidTheMonth(uid, teamUid);
+ return hongBaoV2CountMapper.getOrderRewardByTeamUidTheMonth(uid, teamUid);
}
+
+ @Override
+ public BigDecimal getRewardMoneyBySelf(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_ZIGOU);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+ @Override
+ public BigDecimal getRewardMoneyByShare(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_SHARE_GOODS);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByInvite(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_YIJI);
+ list.add(HongBaoV2.TYPE_ERJI);
+ list.add(HongBaoV2.TYPE_SHARE_YIJI);
+ list.add(HongBaoV2.TYPE_SHARE_ERJI);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+ @Override
+ public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment) {
+ return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, time, payment);
+ }
+
+ @Override
+ public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState, String orderNo, Integer source, String startTime, String endTime) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, source,
+ startTime, endTime);
+ }
+
}
--
Gitblit v1.8.0