From 1ebf83b7b8ae636f00d49406e4c9bbff2d73c34d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 20 八月 2024 18:46:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
index 93b5c54..4bc05f6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -1,10 +1,20 @@
package com.ruoyi.order.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.api.model.TOrderAppeal;
-import com.ruoyi.order.mapper.TOrderAppealMapper;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.order.api.model.*;
+import com.ruoyi.order.api.query.TOrderAppealQuery;
+import com.ruoyi.order.api.vo.TOrderAppealVO;
+import com.ruoyi.order.mapper.*;
+import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderAppealService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +27,59 @@
@Service
public class TOrderAppealServiceImpl extends ServiceImpl<TOrderAppealMapper, TOrderAppeal> implements TOrderAppealService {
+ @Autowired
+ private TChargingOrderMapper chargingOrderMapper;
+ @Autowired
+ private TExchangeOrderMapper exchangeOrderMapper;
+ @Autowired
+ private TShoppingOrderMapper shoppingOrderMapper;
+ @Autowired
+ private TVipOrderMapper vipOrderMapper;
+
+ @Override
+ public PageInfo<TOrderAppealVO> pageList(TOrderAppealQuery query) {
+ PageInfo<TOrderAppealVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
+ List<TOrderAppealVO> list = this.baseMapper.pageList(query,pageInfo);
+ List<Long> orderIds = list.stream().map(TOrderAppealVO::getOrderId).collect(Collectors.toList());
+ // 查询当前页的订单
+ List<TChargingOrder> chargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
+ .in(TChargingOrder::getId, orderIds));
+ List<TExchangeOrder> exchangeOrders = exchangeOrderMapper.selectList(Wrappers.lambdaQuery(TExchangeOrder.class)
+ .in(TExchangeOrder::getId, orderIds));
+ List<TShoppingOrder> shoppingOrders = shoppingOrderMapper.selectList(Wrappers.lambdaQuery(TShoppingOrder.class)
+ .in(TShoppingOrder::getId, orderIds));
+ List<TVipOrder> vipOrders = vipOrderMapper.selectList(Wrappers.lambdaQuery(TVipOrder.class)
+ .in(TVipOrder::getId, orderIds));
+ list.forEach(item -> {
+ if (item.getOrderType() == 1) {
+ item.setChargingOrder(chargingOrders.stream().filter(chargingOrder -> chargingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
+ } else if (item.getOrderType() == 2) {
+ item.setExchangeOrder(exchangeOrders.stream().filter(exchangeOrder -> exchangeOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
+ }else if (item.getOrderType() == 3) {
+ item.setShoppingOrder(shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
+ }else if (item.getOrderType() == 4) {
+ item.setVipOrder(vipOrders.stream().filter(vipOrder -> vipOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
+ }
+ });
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public TOrderAppealVO getDetailById(Integer id) {
+ TOrderAppeal orderAppeal = this.baseMapper.selectById(id);
+ TOrderAppealVO orderAppealVO = new TOrderAppealVO();
+ BeanUtils.copyProperties(orderAppeal,orderAppealVO);
+ // 查询申诉详情
+ if (orderAppeal.getOrderType() == 1) {
+ orderAppealVO.setChargingOrder(chargingOrderMapper.selectById(orderAppeal.getOrderId()));
+ } else if (orderAppeal.getOrderType() == 2) {
+ orderAppealVO.setExchangeOrder(exchangeOrderMapper.selectById(orderAppeal.getOrderId()));
+ }else if (orderAppeal.getOrderType() == 3) {
+ orderAppealVO.setShoppingOrder(shoppingOrderMapper.selectById(orderAppeal.getOrderId()));
+ }else if (orderAppeal.getOrderType() == 4) {
+ orderAppealVO.setVipOrder(vipOrderMapper.selectById(orderAppeal.getOrderId()));
+ }
+ return orderAppealVO;
+ }
}
--
Gitblit v1.7.1