Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 b4b44f2021dbf083b7057fb7e192b72d08b4bf17

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

@@ -272,6 +272,10 @@
               .map(TOrderInvoiceDetail::getOrderId).collect(Collectors.toList());
         // 将其全部转化为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

@@ -293,11 +297,6 @@
            e.setAddedService(orderInvoiceDetailList.stream().filter(t->t.getAddedService()!=null).map(TOrderInvoiceDetail::getAddedService).reduce(BigDecimal::add).get());
            e.setElectrovalence(orderInvoiceDetailList.stream().filter(t->t.getElectrovalence()!=null).map(TOrderInvoiceDetail::getElectrovalence).reduce(BigDecimal::add).get());
            e.setServiceCharge(orderInvoiceDetailList.stream().filter(t->t.getServiceCharge()!=null).map(TOrderInvoiceDetail::getServiceCharge).reduce(BigDecimal::add).get());
            if (e.getBillingUserId()!=null){
               e.setUserPhone(finalTAppUsers.stream().filter(t->t.getId()!=null).filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
            }
            TAppUser appUser = appUserClient.getUserById(e.getAppUserId()).getData();
            e.setUserPhone(appUser.getPhone());
         });
      }