From ceb2276190e7ae9158498bc5f5ac80e0c4275c9e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 9 Oct 2025 16:02:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E5=BC=80=E7=A5=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E8=AE=A2=E5=8D=95=E6=80=BB=E9=A2=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/funds/invoice/vo/InvoiceAvailablePageRespVO.java | 6 ++++++ .../system/service/funds/invoice/InvoiceServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAvailablePageRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAvailablePageRespVO.java index 79a034e6b..acf31064c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAvailablePageRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAvailablePageRespVO.java @@ -25,4 +25,10 @@ public class InvoiceAvailablePageRespVO { @Schema(description = "可开票金额") private BigDecimal availableAmount; + + @Schema(description = "订单总额") + private BigDecimal totalAmount; + + @Schema(description = "产品名称") + private String productName; } 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 ef57e5188..f34caf424 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 @@ -198,6 +198,8 @@ public class InvoiceServiceImpl implements InvoiceService { availablePageRespVO.setTradeType(TradeTypeEnum.PRODUCT.getCode()); // 可开票金额=总额扣除赠送金 availablePageRespVO.setAvailableAmount(i.getTotalAmount().subtract(i.getGiftMoneySpent())); + availablePageRespVO.setProductName(i.getProductName()); + availablePageRespVO.setTotalAmount(i.getTotalAmount()); availablePageRespVOS.add(availablePageRespVO); }); return new PageResult<>(availablePageRespVOS, availablePage.getTotal());