From 1689b64fe1352a7c7c1ce2a45b16058bf168dd83 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 14:27:59 +0800
Subject: [PATCH] feat(mall): 会员首页展示会员等级数量

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 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 438a86b..60be509 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
@@ -361,7 +361,7 @@
             mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
         }
 
-        this.baseMapper.updateById(mallMember);
+        this.baseMapper.updateNameAndAvatar(member.getId(),modifyMemberInfoDto.getName(),modifyMemberInfoDto.getPhoto());
         return new FebsResponse().success().message("修改成功");
     }
 
@@ -691,20 +691,24 @@
     @Override
     public void setPayment(ApiMallMemberPaymentDto apiMallMemberPaymentDto) {
 
-        List<MallMemberPayment> mallMemberPayments = mallMemberPaymentMapper.selectList(
-                new LambdaQueryWrapper<MallMemberPayment>().eq(MallMemberPayment::getBank, apiMallMemberPaymentDto.getBank()));
-        if(CollUtil.isNotEmpty(mallMemberPayments)){
-            throw new FebsException("地址已使用");
-        }
-
         MallMember member = LoginUserUtil.getLoginUser();
         if(null == apiMallMemberPaymentDto.getId()){//新增
+            List<MallMemberPayment> mallMemberPayments = mallMemberPaymentMapper.selectList(
+                    new LambdaQueryWrapper<MallMemberPayment>().eq(MallMemberPayment::getBank, apiMallMemberPaymentDto.getBank()));
+            if(CollUtil.isNotEmpty(mallMemberPayments)){
+                throw new FebsException("地址已使用");
+            }
             MallMemberPayment mallMemberPayment = new MallMemberPayment();
             mallMemberPayment.setMemberId(member.getId());
             mallMemberPayment.setBankNo(apiMallMemberPaymentDto.getBankNo());
             mallMemberPayment.setBank(apiMallMemberPaymentDto.getBank());
             mallMemberPaymentMapper.insert(mallMemberPayment);
         }else{
+            List<MallMemberPayment> mallMemberPayments = mallMemberPaymentMapper.selectList(
+                    new LambdaQueryWrapper<MallMemberPayment>().eq(MallMemberPayment::getBank, apiMallMemberPaymentDto.getBank()));
+            if(CollUtil.isNotEmpty(mallMemberPayments) && mallMemberPayments.size() > 1){
+                throw new FebsException("地址已使用");
+            }
             MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectById(apiMallMemberPaymentDto.getId());
             mallMemberPayment.setMemberId(member.getId());
             mallMemberPayment.setBankNo(apiMallMemberPaymentDto.getBankNo());
@@ -1576,7 +1580,11 @@
             mallMoneyFlowLambdaQueryWrapper.ge(MallMoneyFlow :: getCreatedTime , dateTime);
         }
         mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow :: getFlowType, FlowTypeEnum.SCORE.getValue());
-        mallMoneyFlowLambdaQueryWrapper.eq(MallMoneyFlow :: getType, RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE.getValue());
+        mallMoneyFlowLambdaQueryWrapper.in(
+                MallMoneyFlow :: getType,
+                RunVipMoneyFlowTypeEnum.GET_SCORE.getValue(),
+                RunVipMoneyFlowTypeEnum.SYS_SCORE.getValue()
+        );
         List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(mallMoneyFlowLambdaQueryWrapper);
 
         List<ApiChartVo> apiChartVos = new ArrayList<>();
@@ -1602,7 +1610,7 @@
         sortedList.forEach(entry -> {
             ApiChartVo apiChartVo = new ApiChartVo();
             MallMember mallMember = this.baseMapper.selectById(entry.getKey());
-            apiChartVo.setPhone(mallMember.getPhone());
+            apiChartVo.setName(mallMember.getName());
             apiChartVo.setAvatar(mallMember.getAvatar());
             apiChartVo.setScore(entry.getValue());
             apiChartVos.add(apiChartVo);

--
Gitblit v1.9.1