Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、发票管理部分文档注解补充、开票金额信息改为无参；2、支付回调更新组织余额异常修复；

Browse Source
This commit is contained in:
gaoqr
2025-08-26 15:33:35 +08:00
parent 390a8916cc
commit 0befaac179
6 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/InvoiceController.java
+6 -6
View File
@@ -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<Boolean> insetInvoiceTitle(@Valid @RequestBody InvoiceTitleReqVO reqVO) {
public CommonResult<Boolean> insetInvoiceTitle(@Valid @RequestBody InvoiceTitleSaveReqVO reqVO) {
invoiceService.insetInvoiceTitle(reqVO);
return success(Boolean.TRUE);
}
@GetMapping("/org/amount")
@Operation(summary = "获取组织的开票金额信息")
public CommonResult<InvoiceAmountRespVO> getInvoiceAmount(@Valid InvoiceAmountAndAvailablePageReqVO pageReqVO) {
return success(invoiceService.getInvoiceAmount(pageReqVO));
public CommonResult<InvoiceAmountRespVO> getInvoiceAmount() {
return success(invoiceService.getInvoiceAmount());
}
@GetMapping("/available")
@@ -67,8 +67,8 @@ public class InvoiceController {
@GetMapping("/manage/amount")
@Operation(summary = "获取管理端开票金额信息")
public CommonResult<InvoiceAmountRespVO> getManageEndPointInvoiceAmount(@Valid InvoiceAmountAndAvailablePageReqVO pageReqVO) {
return success(invoiceService.getManageInvoiceAmount(pageReqVO));
public CommonResult<InvoiceAmountRespVO> getManageEndPointInvoiceAmount() {
return success(invoiceService.getManageInvoiceAmount());
}
@PostMapping("")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceAmountAndAvailablePageRespVO.java
-20
View File
@@ -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<PurchaseRecordDO> availableInvoicePurchaseRecords;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleReqVO.java → cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleSaveReqVO.java
+2 -1
View File
@@ -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")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceService.java
+4 -6
View File
@@ -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();
/**
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java
+4 -4
View File
@@ -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();
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
+2 -2
View File
@@ -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);
}
}