puzhibing
2024-09-18 4b486f955cd3d36fa09e372c484b7a66711d7ec7
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1934,14 +1934,15 @@
      List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
      for (TSettlementConfirm tSettlementConfirm : list) {
         tSettlementConfirm.setUid(tSettlementConfirm.getId().toString());
         Partner data = siteClient.getPartnerR(tSettlementConfirm.getPartnerId()).getData();
         List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
         if (!data1.isEmpty()){
            tSettlementConfirm.setSiteName(data1.get(0).getName());
            Partner data = siteClient.getPartnerR(data1.get(0).getPartnerId()).getData();
            if (data!=null){
               tSettlementConfirm.setPartnerName(data.getName());
            }
         }
         if (data!=null){
            tSettlementConfirm.setPartnerName(data.getName());
         }
         String format = tSettlementConfirm.getStartTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
         String format1 = tSettlementConfirm.getEndTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
         tSettlementConfirm.setTime(format+"至"+format1);