明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-10-23 ee2bf95f3472a4179ee0fc7c8e4e2a35e1214bc8 
 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);


@@ -271,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




@@ -292,9 +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());


            }


         });


      }