ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -390,7 +390,6 @@ TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData(); for (TChargingOrder chargingOrder : data.getList()) { SettlementExportVO settlementExportVO = new SettlementExportVO(); BeanUtils.copyProperties(data, settlementExportVO); List<Site> data3 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData(); if (data3!=null && (!data3.isEmpty())){ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -74,7 +74,8 @@ ChargingBillVO res = chargingBillService.chargingBillList1(dto); List<ChargingBillListVO> records = res.getList().getRecords(); accountListVO.setBillCount(records.size()); accountListVO.setTotalAmount(res.getOrderAmount()); accountListVO.setTotalAmount(res.getOrderAmount().subtract(res.getRefundAmount()) .subtract(res.getCommissionAmount()).subtract(res.getSharingAmount())); accountListVO.setPaymentAmount(res.getPaymentAmount()); accountListVO.setRefundAmount(res.getRefundAmount()); accountListVO.setCommissionAmount(res.getCommissionAmount()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -248,11 +248,11 @@ } } if (data3!=null)tChargingOrder.setUserName(data3.getName()); // 累加实收金额 // 累加实收金额 支付结算金额 if (tChargingOrder.getOrderAmount()!=null){ paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount()); } // 累加订单金额 // 入账金额 if (tChargingOrder.getOrderAmount()!=null){ orderAmount = orderAmount.add(tChargingOrder.getOrderAmount()); } @@ -263,7 +263,7 @@ List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2) .eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list(); for (TChargingOrderRefund tChargingOrderRefund : list2) { refundAmount = refundAmount.add(tChargingOrderRefund.getRefundAmount()); refundAmount = refundAmount.add(tChargingOrderRefund.getRefundTotalAmount()); } // 累加累计服务费 if (tChargingOrder.getServiceCharge()!=null){ @@ -298,8 +298,8 @@ .subtract(chargingBillVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillVO.getCommissionAmount()) .subtract(chargingBillVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillVO.getSharingAmount())); chargingBillListVO.setPaymentAmount(paymentAmount == null?BigDecimal.ZERO:paymentAmount); chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount); chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:orderAmount); chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount.subtract(refundAmount).subtract(commissionAmount).subtract(sharingAmount)); chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount); chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence); chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge); chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2, RoundingMode.HALF_DOWN)); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -118,7 +118,12 @@ for (ExchangeRecordVO record : data) { TCoupon byId = tCouponService.getById(record.getCouponId()); if (byId!=null){ if (byId.getDiscountAmount()!=null){ record.setDiscountAmount("￥"+byId.getDiscountAmount()); }else{ record.setDiscountAmount("￥"+byId.getMaximumDiscountAmount()); } if (Objects.equals(byId.getMeetTheConditions(), BigDecimal.ZERO)){ record.setMeetTheConditions("无门槛"); }else{
