From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法,支持分页和搜索 - 在 AdminActivityController 中添加 list 接口,返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板,根据活动状态控制按钮显示

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
index 12c7d08..6ca7a53 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
@@ -189,18 +189,20 @@
         List<MallTeamLeader> mallTeamLeaderNo = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_NO);
         if(CollUtil.isNotEmpty(mallTeamLeaderNo)){
             mallTeamLeaderAdd = mallTeamLeaderNo.get(0);
-        }
-//        Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
-//        if(1 <= bonusPercent || 0 > bonusPercent){
-//            return new FebsResponse().fail().message("请输入合适的百分比小数");
-//        }
-        if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
-            mallTeamLeaderAdd = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
-            mallTeamLeaderAdd.setState(MallTeamLeader.STATE_YES);
-            //申请团长默认关闭返利,返利比例为0
-            mallTeamLeaderAdd.setProfitSwitch(2);
-            mallTeamLeaderAdd.setBonusPercent("0");
-            this.baseMapper.updateById(mallTeamLeaderAdd);
+            if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
+                mallTeamLeaderAdd.setName(adminLeaderAddDto.getName());
+                mallTeamLeaderAdd.setPhone(adminLeaderAddDto.getPhone());
+                mallTeamLeaderAdd.setAddressPic(adminLeaderAddDto.getAddressPic());
+                mallTeamLeaderAdd.setAddressArea(adminLeaderAddDto.getAddressArea());
+                mallTeamLeaderAdd.setDetailAddress(adminLeaderAddDto.getDetailAddress());
+                mallTeamLeaderAdd.setLongitude(adminLeaderAddDto.getLongitude());
+                mallTeamLeaderAdd.setLatitude(adminLeaderAddDto.getLatitude());
+                mallTeamLeaderAdd.setState(MallTeamLeader.STATE_YES);
+                //申请团长默认关闭返利,返利比例为0
+                mallTeamLeaderAdd.setProfitSwitch(2);
+                mallTeamLeaderAdd.setBonusPercent("0");
+                this.baseMapper.updateById(mallTeamLeaderAdd);
+            }
         }else{
             MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
             mallTeamLeader.setUniqueCode(mallMember.getInviteId());
@@ -213,6 +215,10 @@
             mallTeamLeader.setBonusPercent("0");
             this.baseMapper.insert(mallTeamLeader);
         }
+//        Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
+//        if(1 <= bonusPercent || 0 > bonusPercent){
+//            return new FebsResponse().fail().message("请输入合适的百分比小数");
+//        }
         return new FebsResponse().success();
     }
 

--
Gitblit v1.9.1