From ba26983a39a4ea64681407026d10b10c4f127b2b Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Fri, 23 May 2025 13:36:55 +0800 Subject: [PATCH] feat(mall): 团队领袖列表增加在线状态筛选 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 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 4cc2cb2..669c97a 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 @@ -26,6 +26,7 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -420,12 +421,13 @@ //退款退款金额 BigDecimal refundAmount = mallRefundEntity.getAmount(); - refundAmount = refundAmount.add(mallOrderInfo.getCarriage()); +// refundAmount = refundAmount.add(mallOrderInfo.getCarriage()); BigDecimal bb = new BigDecimal(100); int refundMoney = refundAmount.multiply(bb).intValue(); //余额支付退款 if(mallRefundEntity.getType() == 3){ + log.info("余额支付退款"); //更新订单详情 mallOrderItem.setState(3); mallOrderItemMapper.updateById(mallOrderItem); @@ -657,4 +659,42 @@ return new FebsResponse().success().data(apiLeaderInfoVo); } + @Override + public FebsResponse happyLeaderList() { + ArrayList<ApiHappyLeaderInfoVo> apiHappyLeaderInfoVos = new ArrayList<>(); + + 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); + } + } -- Gitblit v1.9.1