From 5f25c762e2853e87fc4b86b157ba87cf1322df2f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 31 八月 2024 14:53:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 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 4bc05f6..6c8d89c 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
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
+import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.vo.SiteNameVO;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.TOrderAppealQuery;
@@ -9,11 +13,14 @@
import com.ruoyi.order.mapper.*;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderAppealService;
+import com.ruoyi.other.api.domain.TGoods;
+import com.ruoyi.other.api.feignClient.GoodsClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -30,11 +37,11 @@
@Autowired
private TChargingOrderMapper chargingOrderMapper;
@Autowired
- private TExchangeOrderMapper exchangeOrderMapper;
- @Autowired
private TShoppingOrderMapper shoppingOrderMapper;
@Autowired
- private TVipOrderMapper vipOrderMapper;
+ private GoodsClient goodsClient;
+ @Autowired
+ private ChargingGunClient chargingGunClient;
@Override
public PageInfo<TOrderAppealVO> pageList(TOrderAppealQuery query) {
@@ -44,42 +51,54 @@
// 查询当前页的订单
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));
+ TChargingOrder tChargingOrder = chargingOrders.stream().filter(chargingOrder -> chargingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
+ if(Objects.nonNull(tChargingOrder)){
+ item.setChargingOrder(chargingOrders.stream().filter(chargingOrder -> chargingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
+ SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
+ item.setGunName(siteNameVO.getGunName());
+ item.setGunNumber(siteNameVO.getGunNumber());
+ item.setPileName(siteNameVO.getPileName());
+ item.setPileNumber(siteNameVO.getPileNumber());
+ item.setSiteName(siteNameVO.getSiteName());
+ }
+ }else if (item.getOrderType() == 2) {
+ TShoppingOrder tShoppingOrder = shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
+ setGoodsInfo(item,tShoppingOrder);
}
});
+ list.forEach(e->e.setUid(e.getId().toString()));
pageInfo.setRecords(list);
return pageInfo;
}
@Override
- public TOrderAppealVO getDetailById(Integer id) {
+ public TOrderAppealVO getDetailById(String 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()));
+ }else if (orderAppeal.getOrderType() == 2) {
+ TShoppingOrder tShoppingOrder = shoppingOrderMapper.selectById(orderAppeal.getOrderId());
+ setGoodsInfo(orderAppealVO,tShoppingOrder);
}
return orderAppealVO;
}
+
+ private void setGoodsInfo(TOrderAppealVO orderAppealVO,TShoppingOrder tShoppingOrder){
+ if(Objects.nonNull(tShoppingOrder)){
+ orderAppealVO.setShoppingOrder(tShoppingOrder);
+ TGoods goods = goodsClient.getGoodsById(tShoppingOrder.getGoodsId()).getData();
+ if(Objects.nonNull(goods)){
+ orderAppealVO.setGoodsName(goods.getName());
+ orderAppealVO.setGoodsPicture(goods.getCoverPicture());
+ }
+ }
+ }
+
}
--
Gitblit v1.7.1