From dde5ffcf56ba046b8f1870ad148341519f8d469a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 19:04:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index b96b8aa..979c1f7 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -10,14 +10,13 @@
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
+import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.entity.MallShoppingCart;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
-import cc.mrbird.febs.mall.mapper.MallShoppingCartMapper;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
+import cc.mrbird.febs.mall.vo.MoneyFlowVo;
import cc.mrbird.febs.mall.vo.TeamListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -27,6 +26,8 @@
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -53,6 +54,7 @@
private final RedisUtils redisUtils;
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallShoppingCartMapper mallShoppingCartMapper;
+ private final MallMoneyFlowMapper mallMoneyFlowMapper;
@Value("${spring.profiles.active}")
private String active;
@@ -206,6 +208,11 @@
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ mallMemberVo.setReferrerName(referMember.getName());
+ }
+
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
return new FebsResponse().success().data(mallMemberVo);
@@ -275,7 +282,7 @@
MallMember mallMember = this.baseMapper.selectById(memberId);
List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
- BigDecimal ownAmount = this.baseMapper.selectOwnAmountByInviteId(mallMember.getInviteId());
+ BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId());
TeamListVo own = new TeamListVo();
own.setCreatedTime(mallMember.getCreatedTime());
@@ -285,8 +292,32 @@
own.setInviteId(mallMember.getInviteId());
own.setIsCurrent(1);
own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
+ own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
own.setId(mallMember.getId());
list.add(0, own);
return new FebsResponse().success().data(list);
}
+
+ @Override
+ public FebsResponse moneyFlows(MoneyFlowDto moneyFlowDto) {
+ IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ moneyFlowDto.setMemberId(id);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+ return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status) {
+ MallMoneyFlow flow = new MallMoneyFlow();
+ flow.setMemberId(memberId);
+ flow.setAmount(amount);
+ flow.setType(type);
+ flow.setOrderNo(orderNo);
+ flow.setDescription(description);
+ flow.setRemark(remark);
+ flow.setRtMemberId(rtMemberId);
+ flow.setStatus(status);
+ mallMoneyFlowMapper.insert(flow);
+ }
}
--
Gitblit v1.9.1