明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
9 小时以前 0f4459e4201fdc19185b7dd03215871f036acd70 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java


@@ -146,7 +146,8 @@


         orderInvoiceDetail.setAddedServiceTariff(invoiceType.getAddedServiceTariff());


         orderInvoiceDetail.setElectrovalence(electrovalence);


         orderInvoiceDetail.setServiceCharge(serviceCharge);


         orderInvoiceDetail.setAddedService(serviceCharge.multiply(invoiceType.getAddedServiceTariff().divide(new BigDecimal(100))));


         orderInvoiceDetail.setAddedService(serviceCharge.multiply(null == invoiceType.getAddedServiceTariff()


               ? new BigDecimal(1) : invoiceType.getAddedServiceTariff().divide(new BigDecimal(100))));


         orderInvoiceDetailService.save(orderInvoiceDetail);


      }


      return AjaxResult.success();


@@ -218,6 +219,8 @@


            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.setElectricCharge(tChargingOrder.getElectrovalence());


            myChargingOrderList.setServiceCharge(tChargingOrder.getServiceCharge());


            chargingOrder.add(myChargingOrderList);


         }


         myOrderInvoiceInfo.setChargingOrder(chargingOrder);


@@ -296,9 +299,9 @@


            }


            e.setElectricityTariff(orderInvoiceDetailList.get(0).getElectricityTariff());


            e.setAddedServiceTariff(orderInvoiceDetailList.get(0).getAddedServiceTariff());


            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());


            e.setAddedService(orderInvoiceDetailList.stream().filter(t->t.getOrderInvoiceId().equals(e.getId()) &&t.getAddedService()!=null).map(TOrderInvoiceDetail::getAddedService).reduce(BigDecimal::add).get());


            e.setElectrovalence(orderInvoiceDetailList.stream().filter(t->t.getOrderInvoiceId().equals(e.getId()) &&t.getElectrovalence()!=null).map(TOrderInvoiceDetail::getElectrovalence).reduce(BigDecimal::add).get());


            e.setServiceCharge(orderInvoiceDetailList.stream().filter(t->t.getOrderInvoiceId().equals(e.getId()) && t.getServiceCharge()!=null).map(TOrderInvoiceDetail::getServiceCharge).reduce(BigDecimal::add).get());


         });


      }