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