fix(mall): 修复拼团团长详情页面订单信息展示问题- 将 ApiHappyOrderLeaderVo 中的 itemId 字段类型从 Stri...

Administrator

2025-05-26 b933c7cdaea1386d50085b1602e4ee2729ac9af2

 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")
        );

@@ -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());