Merge remote-tracking branch 'origin/master'

xuhy

2024-10-18 b5a8762bf2c31c6465c721fa669fd807ffdbb5c2

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

@@ -215,7 +215,7 @@
            myChargingOrderList.setEndMode(tChargingOrder.getEndMode());
            BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
            myChargingOrderList.setPayMoney(payMoney);
            myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
            myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")));
            chargingOrder.add(myChargingOrderList);
         }
         myOrderInvoiceInfo.setChargingOrder(chargingOrder);
@@ -245,6 +245,7 @@
            myShoppingOrderList.setUnitPrice(unitPrice);
            myShoppingOrderList.setNumber(tShoppingOrder.getPurchaseQuantity());
            myShoppingOrderList.setPaymentAmount(tShoppingOrder.getPaymentAmount());
            myShoppingOrderList.setCreateTime(tShoppingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")));
            shoppingOrder.add(myShoppingOrderList);
         }
         myOrderInvoiceInfo.setShoppingOrder(shoppingOrder);
@@ -295,6 +296,8 @@
            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());
         });
      }