From 5a12ca5146be9a3525b5ce5b98c2bd6347a7f25a Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Tue, 25 Jun 2024 22:11:27 +0800 Subject: [PATCH] fix --- .../task/OrderRankingSettlementTask.java | 2 +- .../impl/PlayClerkRankingInfoServiceImpl.java | 9 ++++++ .../impl/PlayClerkUserInfoServiceImpl.java | 3 ++ .../PlayClerkUserReviewInfoServiceImpl.java | 10 +++++++ .../controller/PlayOrderInfoController.java | 27 ++++++++++-------- .../order/service/IPlayOrderInfoService.java | 3 +- .../impl/PlayOrderInfoServiceImpl.java | 28 +++++++++++++++---- .../IPlayPersonnelGroupInfoService.java | 6 ++++ 8 files changed, 69 insertions(+), 19 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java index ed19bb9..cd2bdce 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java @@ -128,7 +128,7 @@ public class OrderRankingSettlementTask { * @since 2024/6/7 11:43 **/ public PlayClerkRankingInfoEntity getClerkRanking(String clerkId, String startTime, String endTime, String weeklyRanking, Integer serialNumber) { - List orderInfoEntities = orderInfoService.listByTime(clerkId, startTime, endTime); + List orderInfoEntities = orderInfoService.listByTime(clerkId, startTime, endTime,null); int orderNumber = orderInfoEntities.size(); BigDecimal orderMoney = BigDecimal.ZERO; Integer orderContinueNumber = 0; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java index 17c8ee4..6ad4ae1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java @@ -10,9 +10,11 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.starry.admin.modules.clerk.mapper.PlayClerkRankingInfoMapper; import com.starry.admin.modules.clerk.module.entity.*; import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.weichat.entity.order.PlayOrderHistoryRankingReturnVo; import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingListVo; import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingReturnVo; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -32,6 +34,9 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl selectByPage(IPlayClerkRankingInfoQueryVo vo) { @@ -55,6 +60,10 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); + lambdaQueryWrapper.orderByAsc(PlayClerkRankingInfoEntity::getRankingIndex); return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), IPlayClerkRankingInfoReturnVo.class, lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java index c5aeef0..0a21b6f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java @@ -289,6 +289,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); return this.baseMapper.selectPage(new Page<>(vo.getPageNum(), vo.getPageSize()), lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java index 2d9a695..4585afa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java @@ -16,12 +16,15 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo; import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService; import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.admin.modules.clerk.service.IPlayClerkUserReviewInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Arrays; +import java.util.List; /** * 店员资料审核Service业务层处理 @@ -37,6 +40,10 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getAddTime); lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getClerkId); return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReviewReturnVo.class, lambdaQueryWrapper); diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java index d42841d..bc58ab3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java @@ -19,6 +19,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** @@ -48,20 +52,21 @@ public class PlayOrderInfoController { */ @PostMapping("/listByPage") public R listByPage(@Validated @RequestBody PlayOrderInfoQueryVo vo) { - //查询当前登录用户所有角色信息 - for (String role : SecurityUtils.getLoginUser().getRoles()) { - SysRoleEntity entity = sysRoleService.selectByRoleId(role); - if (entity == null) { - continue; - } - //如果当前登录用户的身份是组长 - if ("leader".equals(entity.getRoleKey())) { - vo.setGroupId(playPersonnelGroupInfoService.selectByUserId(SecurityUtils.getUserId()).getId()); - } - } return R.ok(orderInfoService.selectOrderInfoPage(vo)); } + /** + * 查询7天内, 已完成 和 进行中的订单 + * 然后进行统计 + */ + @PostMapping("/listByTime") + public R listByTime(@Validated @RequestBody PlayOrderComplaintQueryVo vo) { + String startTime = "2024-06-24 00:00:00"; + String nedTime = "2024-06-24 00:00:00"; + List list = orderInfoService.listByTime("", startTime, nedTime, Stream.of("2","3").collect(Collectors.toList())); + return R.ok(list); + } + /** * 订单退款 diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java index 595aa96..1d25d62 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java @@ -119,9 +119,10 @@ public interface IPlayOrderInfoService extends IService { * @param clerkId 店员ID * @param startTime 开始时间 * @param endTime 结束时间 + * @param orderStatus 店员状态列表 * @return List */ - List listByTime(String clerkId, String startTime, String endTime); + List listByTime(String clerkId, String startTime, String endTime, List orderStatus); /** * 分页查询打赏订单 diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index e4a0cfa..756c6d0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -24,7 +24,9 @@ import com.starry.admin.modules.order.service.IPlayOrderComplaintInfoService; import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService; import com.starry.admin.modules.order.service.IPlayOrderInfoService; import com.starry.admin.modules.order.service.IPlayOrderRefundInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.weichat.entity.order.*; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.IdUtils; import com.starry.common.utils.StringUtils; @@ -37,10 +39,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; import java.util.stream.Collectors; import static com.starry.admin.modules.order.module.constant.OrderConstant.ORDER_STATUS_2; @@ -74,6 +73,10 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl getTotalOrderInfo(String tenantId) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); @@ -266,10 +269,16 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl listByTime(String clerkId, String startTime, String endTime) { + public List listByTime(String clerkId, String startTime, String endTime, List orderStatus) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); - lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId); + if (StrUtil.isNotEmpty(clerkId)) { + lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId); + } + if (orderStatus != null) { + lambdaQueryWrapper.in(PlayOrderInfoEntity::getOrderStatus, new ArrayList<>()); + } lambdaQueryWrapper.between(PlayOrderInfoEntity::getAcceptTime, startTime, endTime); + return this.baseMapper.selectList(lambdaQueryWrapper); } @@ -368,6 +377,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl selectOrderInfoPage(PlayOrderInfoQueryVo vo) { + MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); if (StringUtils.isNotBlank(vo.getGroupId())) { lambdaQueryWrapper.eq(PlayOrderInfoEntity::getGroupId, vo.getGroupId()); @@ -387,6 +397,12 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList); + + + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java index ee57e1e..45897c9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java @@ -83,5 +83,11 @@ public interface IPlayPersonnelGroupInfoService extends IService getValidClerkIdList(LoginUser loginUser); }