From 3392f0e5dbd791e6dfd29c1e76a3e368b0f223da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Sep 2022 17:51:08 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 43b641c..d127eb4 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
@@ -6,6 +6,7 @@
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.common.utils.ShareCodeUtil;
 import cc.mrbird.febs.common.utils.SpringContextHolder;
+import cc.mrbird.febs.mall.conversion.MallLeaderAchieveConversion;
 import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
 import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
 import cc.mrbird.febs.mall.dto.*;
@@ -258,7 +259,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)){
@@ -365,6 +368,11 @@
                     mallOrderInfoMapper.updateById(mallOrderRefund);
                 }
             }else{
+
+                //更新订单详情
+                mallOrderItem.setState(1);
+                mallOrderItemMapper.updateById(mallOrderItem);
+
                 mallRefundEntity.setState(2);
                 mallRefundMapper.updateById(mallRefundEntity);
                 return new FebsResponse().fail().message("退款失败,请联系客服人员");
@@ -409,4 +417,13 @@
         return new FebsResponse().success().data(apiLeaderProfitVo);
     }
 
+    @Override
+    public List<ApiOrderProfitVo> findLeaderProfitListInPage(ApiOrderProfitDto apiOrderProfitDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        IPage<MallLeaderAchieve> page = new Page<>(apiOrderProfitDto.getPageNum(), apiOrderProfitDto.getPageSize());
+        apiOrderProfitDto.setInvitedId(member.getInviteId());
+        IPage<MallLeaderAchieve> mallLeaderAchieves = mallLeaderAchieveMapper.selectApiLeaderProfitListInPage(page, apiOrderProfitDto);
+        return MallLeaderAchieveConversion.INSTANCE.entitysToVos(mallLeaderAchieves.getRecords());
+    }
+
 }

--
Gitblit v1.9.1