From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 07 Jul 2025 17:51:09 +0800 Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码 --- 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