From 0befaac179d51a19e709074e6578e733968955fa Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 26 Aug 2025 15:33:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=91=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=87=E6=A1=A3=E6=B3=A8=E8=A7=A3=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E3=80=81=E5=BC=80=E7=A5=A8=E9=87=91=E9=A2=9D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=94=B9=E4=B8=BA=E6=97=A0=E5=8F=82=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BD=99=E9=A2=9D=E5=BC=82=E5=B8=B8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../funds/invoice/InvoiceController.java | 12 +++++------ .../InvoiceAmountAndAvailablePageRespVO.java | 20 ------------------- ...eReqVO.java => InvoiceTitleSaveReqVO.java} | 3 ++- .../service/funds/invoice/InvoiceService.java | 10 ++++------ .../funds/invoice/InvoiceServiceImpl.java | 8 ++++---- .../organamount/OrganAmountServiceImpl.java | 4 ++-- 6 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAmountAndAvailablePageRespVO.java rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/{InvoiceTitleReqVO.java => InvoiceTitleSaveReqVO.java} (95%) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/InvoiceController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/InvoiceController.java index f1d8e115a..aa7e1f967 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/InvoiceController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/InvoiceController.java @@ -9,7 +9,7 @@ import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceDetail import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceDetailsRespVO; import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceRecordsReqVO; import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceRecordsRespVO; -import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleReqVO; +import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleSaveReqVO; import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO; import com.cf.imes.module.system.service.funds.invoice.InvoiceService; import io.swagger.v3.oas.annotations.Operation; @@ -48,15 +48,15 @@ public class InvoiceController { @PostMapping("/title") @Operation(summary = "新增/修改发票抬头信息") - public CommonResult insetInvoiceTitle(@Valid @RequestBody InvoiceTitleReqVO reqVO) { + public CommonResult insetInvoiceTitle(@Valid @RequestBody InvoiceTitleSaveReqVO reqVO) { invoiceService.insetInvoiceTitle(reqVO); return success(Boolean.TRUE); } @GetMapping("/org/amount") @Operation(summary = "获取组织的开票金额信息") - public CommonResult getInvoiceAmount(@Valid InvoiceAmountAndAvailablePageReqVO pageReqVO) { - return success(invoiceService.getInvoiceAmount(pageReqVO)); + public CommonResult getInvoiceAmount() { + return success(invoiceService.getInvoiceAmount()); } @GetMapping("/available") @@ -67,8 +67,8 @@ public class InvoiceController { @GetMapping("/manage/amount") @Operation(summary = "获取管理端开票金额信息") - public CommonResult getManageEndPointInvoiceAmount(@Valid InvoiceAmountAndAvailablePageReqVO pageReqVO) { - return success(invoiceService.getManageInvoiceAmount(pageReqVO)); + public CommonResult getManageEndPointInvoiceAmount() { + return success(invoiceService.getManageInvoiceAmount()); } @PostMapping("") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAmountAndAvailablePageRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAmountAndAvailablePageRespVO.java deleted file mode 100644 index acf0a710a..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAmountAndAvailablePageRespVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cf.imes.module.system.controller.admin.funds.invoice.vo; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * @author Gqr - * @since 2025/8/21 16:11 - */ -@Data -@Schema(description = "管理后台 - 组织开票金额和可开票列表 Response VO") -public class InvoiceAmountAndAvailablePageRespVO { - @Schema(description = "发票金额信息") - private InvoiceAmountRespVO invoiceAmountRespVO; - - @Schema(description = "可开票记录") - private PageResult availableInvoicePurchaseRecords; -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleSaveReqVO.java similarity index 95% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleReqVO.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleSaveReqVO.java index 75dd93718..bb6d7ab49 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleSaveReqVO.java @@ -12,7 +12,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Data -public class InvoiceTitleReqVO { +@Schema(description = "管理后台 - 发票抬头 Request VO") +public class InvoiceTitleSaveReqVO { @Schema(description = "发票抬头ID") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceService.java index 6eeb170aa..6b37fcf3f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceService.java @@ -8,7 +8,7 @@ import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceDetail import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceDetailsRespVO; import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceRecordsReqVO; import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceRecordsRespVO; -import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleReqVO; +import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleSaveReqVO; import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO; import org.springframework.web.multipart.MultipartFile; @@ -24,23 +24,21 @@ public interface InvoiceService { * * @param reqVO */ - void insetInvoiceTitle(InvoiceTitleReqVO reqVO); + void insetInvoiceTitle(InvoiceTitleSaveReqVO reqVO); /** * 查询组织开票金额 * - * @param invoiceAmountAndAvailablePageReqVO * @return */ - InvoiceAmountRespVO getInvoiceAmount(InvoiceAmountAndAvailablePageReqVO invoiceAmountAndAvailablePageReqVO); + InvoiceAmountRespVO getInvoiceAmount(); /** * 查询管理端开票金额 * - * @param invoiceAmountAndAvailablePageReqVO * @return */ - InvoiceAmountRespVO getManageInvoiceAmount(InvoiceAmountAndAvailablePageReqVO invoiceAmountAndAvailablePageReqVO); + InvoiceAmountRespVO getManageInvoiceAmount(); /** 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 34d7e7143..0d7624284 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 @@ -24,7 +24,7 @@ import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoicePurcha import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceRecordsReqVO; import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceRecordsRespVO; import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleInfo; -import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleReqVO; +import com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceTitleSaveReqVO; import com.cf.imes.module.system.dal.dataobject.funds.invoice.InvoiceRecordsDO; import com.cf.imes.module.system.dal.dataobject.funds.invoice.InvoiceTitleInfoDO; import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO; @@ -86,7 +86,7 @@ public class InvoiceServiceImpl implements InvoiceService { private FileApi fileApi; @Override - public void insetInvoiceTitle(InvoiceTitleReqVO reqVO) { + public void insetInvoiceTitle(InvoiceTitleSaveReqVO reqVO) { if (reqVO.getId() != null) { validTitleOrg(reqVO.getId(), reqVO.getOrganId()); @@ -126,12 +126,12 @@ public class InvoiceServiceImpl implements InvoiceService { } @Override - public InvoiceAmountRespVO getInvoiceAmount(InvoiceAmountAndAvailablePageReqVO invoiceAmountAndAvailablePageReqVO) { + public InvoiceAmountRespVO getInvoiceAmount() { return purchaseRecordMapper.getOrgInvoiceAmountStatistics(SecurityFrameworkUtils.getUserOrganId()); } @Override - public InvoiceAmountRespVO getManageInvoiceAmount(InvoiceAmountAndAvailablePageReqVO invoiceAmountAndAvailablePageReqVO) { + public InvoiceAmountRespVO getManageInvoiceAmount() { return invoiceRecordsMapper.getManageInvoiceAmountStatistics(); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java index 7261806f5..8c0585762 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java @@ -91,10 +91,10 @@ public class OrganAmountServiceImpl implements OrganAmountService { if (updated == 0) { throw exception(ORGAN_RECHARGE_AMOUNT_UPDATE_ERROR); } else { - return new OrganRechargeAmountRespVO(newAmount.add(newGift), newAmount, newGift); + return new OrganRechargeAmountRespVO(ObjectUtil.isNull(newGift) ? newAmount : newAmount.add(newGift), newAmount, newGift); } } else { - return new OrganRechargeAmountRespVO(newAmount.add(newGift), newAmount, newGift); + return new OrganRechargeAmountRespVO(ObjectUtil.isNull(newGift) ? newAmount : newAmount.add(newGift), newAmount, newGift); } }