修改bug

puzhibing

2026-03-30 63ac3d9a04abf65cdf8062645d7a43f575def9d7

修改bug

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java

@@ -31,5 +31,7 @@
    private String userPhone;
    @ApiModelProperty(value = "充电订单ids")
    private List<String> ids;
    @ApiModelProperty("站点名称")
    private String siteName;

}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java

@@ -65,6 +65,14 @@
        getChargingOrderByLicensePlate.setLicensePlate(carNumber);
        getChargingOrderByLicensePlate.setStartTime(inParkingTime);
        TChargingOrder tChargingOrder = chargingOrderClient.getChargingOrderByLicensePlate(getChargingOrderByLicensePlate).getData();
        //循环3次查询，临时使用
        for (int i = 0; i < 3; i++) {
            if(null == tChargingOrder){
                tChargingOrder = chargingOrderClient.getChargingOrderByLicensePlate(getChargingOrderByLicensePlate).getData();
            }else{
                break;
            }
        }
        
        GetCouponResp resp = new GetCouponResp();
        resp.setRecordId(data.getId());

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

@@ -287,16 +287,23 @@
        query.setUserIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
        PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
        List<TOrderInvoiceVO> list = this.baseMapper.pageList(query,pageInfo);
        List<Site> siteList = siteClient.getSiteAll().getData();
        for (TOrderInvoiceVO tOrderInvoiceVO : list) {
            tOrderInvoiceVO.setUid(tOrderInvoiceVO.getId().toString());
            List<Long> collect = orderInvoiceDetailService.lambdaQuery().eq(TOrderInvoiceDetail::getOrderInvoiceId, tOrderInvoiceVO.getId()).list().stream()
                    .map(TOrderInvoiceDetail::getOrderId).collect(Collectors.toList());
            Integer siteId = chargingOrderService.listByIds(collect).get(0).getSiteId();
            Site site = siteList.stream().filter(o -> o.getId().equals(siteId)).findFirst().orElse(null);
            if(null != site){
                tOrderInvoiceVO.setSiteName(site.getName());
            }
            // 将其全部转化为String
            tOrderInvoiceVO.setIds(collect.stream().map(String::valueOf).collect(Collectors.toList()));
            TAppUser appUser = appUserClient.getUserById(tOrderInvoiceVO.getAppUserId()).getData();
            if (appUser!=null){
                tOrderInvoiceVO.setUserPhone(appUser.getPhone());
            }

        }
        // 查询这个开票的订单ids