From a4fc8d1a88374ee4e1aba8acde5567e0abe9f659 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 09:50:40 +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 | 5 +++--
1 files changed, 3 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 a4d30ce..80c16b5 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,11 +65,12 @@
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;
}
@@ -82,7 +83,7 @@
// 查询申诉详情
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