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