大屏

huliguo

2 天以前 8115295a64e0809246897fefb8c45de06dce0799

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java

@@ -76,6 +76,7 @@
                TShoppingOrder tShoppingOrder = shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
                setGoodsInfo(item,tShoppingOrder);
            }
            item.setOrderIdStr(item.getOrderId().toString());
        });
        list.forEach(e->e.setUid(e.getId().toString()));
        pageInfo.setRecords(list);
@@ -92,12 +93,21 @@
            TChargingOrder tChargingOrder = chargingOrderMapper.selectById(orderAppeal.getOrderId());
            orderAppealVO.setChargingOrder(tChargingOrder);
            if(Objects.nonNull(tChargingOrder)){
                SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
                if(Objects.nonNull(siteNameVO)){
                    orderAppealVO.setGunName(siteNameVO.getGunName());
                    orderAppealVO.setGunNumber(siteNameVO.getGunNumber());
                    orderAppealVO.setPileName(siteNameVO.getPileName());
                    orderAppealVO.setPileNumber(siteNameVO.getPileNumber());
                    orderAppealVO.setSiteName(siteNameVO.getSiteName());
                }
                orderAppealVO.setEndMode(tChargingOrder.getEndMode());
            }
        }else if (orderAppeal.getOrderType() == 2) {
            TShoppingOrder tShoppingOrder = shoppingOrderMapper.selectById(orderAppeal.getOrderId());
            setGoodsInfo(orderAppealVO,tShoppingOrder);
        }
        orderAppealVO.setOrderIdStr(orderAppealVO.getOrderId().toString());
        return orderAppealVO;
    }