Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

liujie

8 小时以前 0f4459e4201fdc19185b7dd03215871f036acd70

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

@@ -63,17 +63,20 @@
                if(Objects.nonNull(tChargingOrder)){
                    item.setChargingOrder(tChargingOrder);
                    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());
                    item.setEndMode(tChargingOrder.getEndMode());
                    if(Objects.nonNull(siteNameVO)){
                        item.setGunName(siteNameVO.getGunName());
                        item.setGunNumber(siteNameVO.getGunNumber());
                        item.setPileName(siteNameVO.getPileName());
                        item.setPileNumber(siteNameVO.getPileNumber());
                        item.setSiteName(siteNameVO.getSiteName());
                        item.setEndMode(tChargingOrder.getEndMode());
                    }
                }
            }else if (item.getOrderType() == 2) {
                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);
@@ -90,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;
    }