From 0a06f5408fe7df16b31ac018c6be7892331c453e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 14 Oct 2025 14:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=BC=80=E7=A5=A8-=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AE=A2=E5=8D=95=E6=80=BB=E9=A2=9D=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/funds/invoice/vo/InvoicePurchaseRecord.java | 2 ++ .../module/system/service/funds/invoice/InvoiceServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java index 9cd28f971..dd979c2d3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java @@ -30,6 +30,8 @@ public class InvoicePurchaseRecord { @Schema(description = "可开票金额") private BigDecimal invoicableAmount; + @Schema(description = "订单总额") + private BigDecimal totalAmount; @Schema(description = "交易时间") private LocalDateTime createTime; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java index f34caf424..95a620f1e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java @@ -285,6 +285,7 @@ public class InvoiceServiceImpl implements InvoiceService { invoicePurchaseRecord.setProductName(purchaseRecordDO.getProductName()); invoicePurchaseRecord.setTradeType(TradeTypeEnum.PRODUCT.getCode()); invoicePurchaseRecord.setInvoicableAmount(purchaseRecordDO.getTotalAmount().subtract(purchaseRecordDO.getGiftMoneySpent())); + invoicePurchaseRecord.setTotalAmount(purchaseRecordDO.getTotalAmount()); invoicePurchaseRecord.setCreateTime(purchaseRecordDO.getCreateTime()); invoicePurchaseRecords.add(invoicePurchaseRecord); }