From ad96e226fed4cb87e6ccdf73084feeb120b2dfb0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 10:28:52 +0800
Subject: [PATCH] feat(mall):会员信息展示优化
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 54 +++++++++++++++++++-----------------------------------
1 files changed, 19 insertions(+), 35 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 13e72cc..8c2676e 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
@@ -661,41 +661,13 @@
}
@Override
- public FebsResponse happyLeaderList() {
- ArrayList<ApiHappyLeaderInfoVo> apiHappyLeaderInfoVos = new ArrayList<>();
+ public FebsResponse happyLeaderList(ApiHappyLeaderInfoDto dto) {
- List<MallTeamLeader> mallTeamLeaders = this.baseMapper.selectList(
- new LambdaQueryWrapper<MallTeamLeader>()
- .select(
- MallTeamLeader::getId,
- MallTeamLeader::getName,
- MallTeamLeader::getPhone,
- MallTeamLeader::getUniqueCode,
- MallTeamLeader::getAddressPic,
- MallTeamLeader::getAddressArea,
- MallTeamLeader::getDetailAddress,
- MallTeamLeader::getLongitude,
- MallTeamLeader::getLatitude)
- .eq(MallTeamLeader::getState, 1)
- .eq(MallTeamLeader::getOnlineState,1)
- );
- if(CollUtil.isNotEmpty(mallTeamLeaders)){
- for (MallTeamLeader mallTeamLeader : mallTeamLeaders){
- ApiHappyLeaderInfoVo apiHappyLeaderInfoVo = new ApiHappyLeaderInfoVo();
- apiHappyLeaderInfoVo.setId(mallTeamLeader.getId());
- apiHappyLeaderInfoVo.setName(mallTeamLeader.getName());
- apiHappyLeaderInfoVo.setPhone(mallTeamLeader.getPhone());
- apiHappyLeaderInfoVo.setTakeUniqueCode(mallTeamLeader.getUniqueCode());
- apiHappyLeaderInfoVo.setAddressPic(mallTeamLeader.getAddressPic());
- apiHappyLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
- apiHappyLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
- apiHappyLeaderInfoVo.setLongitude(mallTeamLeader.getLongitude());
- apiHappyLeaderInfoVo.setLatitude(mallTeamLeader.getLatitude());
- apiHappyLeaderInfoVos.add(apiHappyLeaderInfoVo);
- }
- }
-
- return new FebsResponse().success().data(apiHappyLeaderInfoVos);
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiHappyLeaderInfoVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ // 调用Mapper方法获取活动分页数据
+ Page<ApiHappyLeaderInfoVo> mallTeamLeaderPage = this.baseMapper.selectApiLeaderInfoInPage(page, dto);
+ return new FebsResponse().success().data(mallTeamLeaderPage);
}
@Override
@@ -711,9 +683,16 @@
String takeCode = dto.getTakeCode();
+ List<Integer> orderStates = Arrays.asList(
+ OrderStatusEnum.WAIT_SHIPPING.getValue(),
+ OrderStatusEnum.WAIT_FINISH.getValue(),
+ OrderStatusEnum.FINISH.getValue()
+ );
+
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOne(
new LambdaQueryWrapper<MallOrderInfo>()
.eq(MallOrderInfo::getTakeCode, takeCode)
+ .in(MallOrderInfo::getStatus, orderStates)
.last("limit 1")
);
@@ -731,7 +710,7 @@
List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
new LambdaQueryWrapper<MallOrderItem>()
.eq(MallOrderItem::getOrderId, mallOrderInfo.getId())
- .eq(MallOrderItem::getLeaderState, StateUpDownEnum.DOWN.getCode())
+// .eq(MallOrderItem::getLeaderState, StateUpDownEnum.DOWN.getCode())
);
if(CollUtil.isNotEmpty(mallOrderItems)){
for(MallOrderItem item : mallOrderItems){
@@ -742,6 +721,7 @@
apiHappyOrderLeaderVo.setOrderId(mallOrderInfo.getId());
apiHappyOrderLeaderVo.setOrderState(mallOrderInfo.getStatus());
apiHappyOrderLeaderVo.setTakeCode(takeCode);
+ apiHappyOrderLeaderVo.setItemId(item.getId());
apiHappyOrderLeaderVo.setGoodsName(item.getGoodsName());
apiHappyOrderLeaderVo.setGoodsSku(item.getSkuName());
apiHappyOrderLeaderVo.setGoodsCnt(item.getCnt());
@@ -772,6 +752,10 @@
if(mallOrderInfo == null){
throw new FebsException("订单不存在！");
}
+ if(mallOrderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()){
+ throw new FebsException("订单不是待收货状态！");
+ }
+
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(mallOrderInfo.getTakeUniqueCode());
if(mallTeamLeader==null){
--
Gitblit v1.9.1