From 097f92827a7f6896dd2861ee83dcfed9204f1abc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 17:27:03 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index f422b2f..0cd9255 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -15,10 +15,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallTeamLeaderService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
-import cc.mrbird.febs.mall.vo.ApiLeaderInfoVo;
-import cc.mrbird.febs.mall.vo.ApiLeaderListVo;
-import cc.mrbird.febs.mall.vo.ApiMallleaderStateVo;
-import cc.mrbird.febs.mall.vo.OrderListVo;
+import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
@@ -62,6 +59,8 @@
private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
private final IMallMoneyFlowService mallMoneyFlowService;
private final IApiMallMemberWalletService memberWalletService;
+ private final MallLeaderAchieveMapper mallLeaderAchieveMapper;
+ private final MallMoneyFlowMapper mallMoneyFlowMapper;
@Override
@Transactional
@@ -259,7 +258,9 @@
MallMember loginUser = LoginUserUtil.getLoginUser();
Long memberId = loginUser.getId();
MallMember mallMember = mallMemberMapper.selectById(memberId);
-
+ if(ObjectUtil.isEmpty(mallMember)){
+ return new FebsResponse().success();
+ }
log.info(mallMember.getInviteId());
MallTeamLeader mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(mallMember.getInviteId());
if(ObjectUtil.isEmpty(mallTeamLeader)){
@@ -386,4 +387,28 @@
return new FebsResponse().success().data(mallRefundEntities.get(0));
}
+ @Override
+ public FebsResponse leaderProfit() {
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+ ApiLeaderProfitVo apiLeaderProfitVo = new ApiLeaderProfitVo();
+
+ BigDecimal totalProfit = mallMoneyFlowMapper.selectAmountByFlowtypeAndType(loginUser.getId(),FlowTypeEnum.BALANCE.getValue(),MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),null,null,null);
+ apiLeaderProfitVo.setTotalProfit(totalProfit);
+ BigDecimal todayProfit = mallMoneyFlowMapper.selectAmountByFlowtypeAndType(loginUser.getId(),FlowTypeEnum.BALANCE.getValue(),
+ MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),
+ null,DateUtil.date(),
+ null);
+ apiLeaderProfitVo.setTodayProfit(todayProfit);
+
+ BigDecimal monthProfit = mallMoneyFlowMapper.selectAmountByFlowtypeAndType(loginUser.getId(),FlowTypeEnum.BALANCE.getValue(),
+ MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),
+ null,null,
+ DateUtil.date());
+ apiLeaderProfitVo.setMonthProfit(monthProfit);
+ BigDecimal waitProfit = mallLeaderAchieveMapper.selectProfitByStateAndDateTimeAndUniqueCode(1,null,loginUser.getInviteId()).setScale(2,BigDecimal.ROUND_DOWN);
+ apiLeaderProfitVo.setWaitProfit(waitProfit);
+
+ return new FebsResponse().success().data(apiLeaderProfitVo);
+ }
+
}
--
Gitblit v1.9.1