From d7bf74a95ab917ef87462c6eecba2cb2443c1ea2 Mon Sep 17 00:00:00 2001 From: hucs Date: Thu, 4 Jul 2024 13:38:47 +0800 Subject: [PATCH] fix --- .../controller/PlayOrderInfoController.java | 9 ----- .../module/vo/PlayOrderInfoReturnVo.java | 3 ++ .../impl/PlayOrderInfoServiceImpl.java | 35 ++++++++----------- 3 files changed, 18 insertions(+), 29 deletions(-) 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 c539a9b..9b5ad35 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 @@ -6,8 +6,6 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity; import com.starry.admin.modules.order.module.vo.*; import com.starry.admin.modules.order.service.IPlayOrderInfoService; import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService; -import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; -import com.starry.admin.modules.system.service.SysRoleService; import com.starry.common.annotation.Log; import com.starry.common.context.CustomSecurityContextHolder; import com.starry.common.enums.BusinessType; @@ -30,13 +28,6 @@ import java.math.BigDecimal; public class PlayOrderInfoController { @Resource private IPlayOrderInfoService orderInfoService; - - @Resource - private SysRoleService sysRoleService; - - @Resource - private IPlayPersonnelGroupInfoService playPersonnelGroupInfoService; - @Resource private IPlayOrderRandomInfoService playOrderRandomInfoService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java index 1de0c6c..5c382cb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java @@ -5,6 +5,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 订单查询返回对象 @@ -181,6 +182,8 @@ public class PlayOrderInfoReturnVo { */ private String backendRemark; + private List labels; + } \ No newline at end of file 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 af844ff..0afd2f8 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 @@ -15,15 +15,9 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity; import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService; import com.starry.admin.modules.order.mapper.PlayOrderInfoMapper; import com.starry.admin.modules.order.module.constant.OrderConstant; -import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity; -import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity; -import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; -import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity; +import com.starry.admin.modules.order.module.entity.*; import com.starry.admin.modules.order.module.vo.*; -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.order.service.*; import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.weichat.entity.order.*; import com.starry.admin.utils.SecurityUtils; @@ -39,10 +33,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; @@ -59,24 +50,20 @@ import static com.starry.admin.modules.order.module.constant.OrderConstant.ORDER public class PlayOrderInfoServiceImpl extends ServiceImpl implements IPlayOrderInfoService { @Resource private PlayOrderInfoMapper orderInfoMapper; - @Resource private IPlayClerkUserInfoService playClerkUserInfoService; - @Resource private IPlayCustomUserInfoService userInfoService; - @Resource private IPlayOrderRefundInfoService playOrderRefundInfoService; - @Resource private IPlayOrderEvaluateInfoService playOrderEvaluateInfoService; - @Resource private IPlayOrderComplaintInfoService playOrderComplaintInfoService; - @Resource private IPlayPersonnelGroupInfoService playClerkGroupInfoService; + @Resource + private IPlayOrderRandomInfoService playOrderRandomInfoService; @Override @@ -407,8 +394,16 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper); + Page page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper); + page.getRecords().forEach(ca -> { + if (ca.getPlaceType().equals("1")) { + PlayOrderRandomInfoEntity randomInfo = playOrderRandomInfoService.getById(ca.getId()); + if (Objects.nonNull(randomInfo)) { + ca.setLabels(randomInfo.getLabels()); + } + } + }); + return page; }