From 0b33175e4e1862a4606eff7de0ec259a92236e39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 31 八月 2024 09:26:57 +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 | 7 ++++---
1 files changed, 4 insertions(+), 3 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 a4d30ce..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
@@ -65,24 +65,25 @@
item.setPileNumber(siteNameVO.getPileNumber());
item.setSiteName(siteNameVO.getSiteName());
}
- }else if (item.getOrderType() == 3) {
+ }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() == 3) {
+ }else if (orderAppeal.getOrderType() == 2) {
TShoppingOrder tShoppingOrder = shoppingOrderMapper.selectById(orderAppeal.getOrderId());
setGoodsInfo(orderAppealVO,tShoppingOrder);
}
--
Gitblit v1.7.1