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-10-09 14:33:58 +08:00
parent e9a649c6d9
commit 6aceb9ad03
10 changed files with 59 additions and 22 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/vo/InvoiceTitleInfo.java
+2 -2
View File
@@ -28,8 +28,8 @@ public class InvoiceTitleInfo {
private Integer invoiceType;
@Schema(description = "纳税人识别号")
private String taxpayerId;
@Schema(description = "统一社会信用代码")
private String taxNumber;
@Schema(description = "开户银行名称")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceTitleSaveReqVO.java
+3 -4
View File
@@ -38,10 +38,9 @@ public class InvoiceTitleSaveReqVO {
private Integer invoiceType;
@Schema(description = "纳税人识别号")
@NotNull(message = "纳税人识别号不能为空")
@Size(max = 20, message = "纳税人识别号长度不能超过20个字符")
private String taxpayerId;
@Schema(description = "统一社会信用代码")
@Size(max = 20, message = "统一社会信用代码长度不能超过18个字符")
private String taxNumber;
@Schema(description = "开户银行名称")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class OrganSaveReqVO {
private Integer grayStatus;
@Schema(description = "产品购买列表")
@Size(max = 10, message = "创建组织时最少需要购买1个产品，最多可购买10个产品")
@Size(min = 1, max = 10, message = "创建组织时最少需要购买1个产品", groups = {OrganSaveCreateGroup.class})
@Valid
private List<OrganCreateProductPurchaseReqVO> productPurchaseReqVOS;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/invoice/InvoiceTitleInfoDO.java
+2 -2
View File
@@ -53,9 +53,9 @@ public class InvoiceTitleInfoDO extends BaseDO {
/**
* 纳税人识别号
* 统一社会信用代码
*/
private String taxpayerId;
private String taxNumber;
/**
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java
+19 -12
View File
@@ -34,6 +34,7 @@ import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO;
import com.cf.imes.module.system.dal.mysql.funds.invoice.InvoiceRecordsMapper;
import com.cf.imes.module.system.dal.mysql.funds.invoice.InvoiceTitleInfoMapper;
import com.cf.imes.module.system.dal.mysql.funds.purchase.PurchaseRecordMapper;
import com.cf.imes.module.system.enums.pay.InvoiceIssueTypeEnum;
import com.cf.imes.module.system.enums.pay.InvoiceStatusEnum;
import com.cf.imes.module.system.enums.pay.TradeTypeEnum;
import com.cf.imes.module.system.service.organ.OrganService;
@@ -55,8 +56,8 @@ import static com.cf.imes.framework.common.util.json.JsonUtils.parseObject;
import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString;
import static com.cf.imes.framework.common.util.json.JsonUtils.unzipString;
import static com.cf.imes.framework.common.util.json.JsonUtils.zipString;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_NO_EXIST;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_TITLE_ENTERPRISE_TAXNUMBER_EMPTY_ERROR;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_TITLE_NOT_EXISTS_ERROR;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_TITLE_ORG_EXISTS_ERROR;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_TITLE_TAXPAYERID_EXISTS_ERROR;
@@ -103,8 +104,12 @@ public class InvoiceServiceImpl implements InvoiceService {
Long id = reqVO.getId();
// 校验纳税人识别号和组织id是否唯一
validOrgAndTaxpayerNo(id, organId, reqVO.getTaxpayerId());
Integer issueType = reqVO.getIssueType();
// 企业发票抬头校验统一社会信用代码非空
AssertUtils.notEmpty(InvoiceIssueTypeEnum.ENTERPRISE.getValue().equals(issueType) ? reqVO.getTaxNumber() : "0", INVOICE_TITLE_ENTERPRISE_TAXNUMBER_EMPTY_ERROR);
// 校验统一社会信用代码和组织id是否唯一
validOrgAndTaxpayerNo(id, organId, reqVO.getTaxNumber(), issueType);
if (id != null) {
validTitleOrg(id, organId);
@@ -119,8 +124,8 @@ public class InvoiceServiceImpl implements InvoiceService {
.organId(organId)
.invoiceTitle(reqVO.getInvoiceTitle())
.invoiceType(reqVO.getInvoiceType())
.issueType(reqVO.getIssueType())
.taxpayerId(reqVO.getTaxpayerId())
.issueType(issueType)
.taxNumber(reqVO.getTaxNumber())
.bankName(reqVO.getBankName())
.bankAccount(reqVO.getBankAccount())
.registeredAddress(reqVO.getRegisteredAddress())
@@ -130,13 +135,14 @@ public class InvoiceServiceImpl implements InvoiceService {
}
/**
* 校验组织和纳税人识别号唯一
* 校验组织和统一社会信用代码
*
* @param id 发票抬头id
* @param organId 组织id
* @param taxpayerId 纳税人识别号
* @param id 发票抬头id
* @param organId 组织id
* @param taxNumber 统一社会信用代码
* @param issueType 开具类型
*/
private void validOrgAndTaxpayerNo(Long id, Long organId, String taxpayerId) {
private void validOrgAndTaxpayerNo(Long id, Long organId, String taxNumber, Integer issueType) {
InvoiceTitleInfoDO exist = invoiceTitleInfoMapper.selectOne(new LambdaQueryWrapperX<InvoiceTitleInfoDO>()
.neIfPresent(InvoiceTitleInfoDO::getId, id)
.eq(InvoiceTitleInfoDO::getOrganId, organId));
@@ -146,8 +152,9 @@ public class InvoiceServiceImpl implements InvoiceService {
}
exist = invoiceTitleInfoMapper.selectOne(new LambdaQueryWrapperX<InvoiceTitleInfoDO>()
.neIfPresent(InvoiceTitleInfoDO::getId, id)
.eq(InvoiceTitleInfoDO::getTaxpayerId, taxpayerId));
if (ObjectUtil.isNotNull(exist)) {
.eq(InvoiceTitleInfoDO::getTaxNumber, taxNumber));
// 开具企业类型发票校验统一社会信用代码
if (InvoiceIssueTypeEnum.ENTERPRISE.getValue().equals(issueType) && ObjectUtil.isNotNull(exist)) {
throw new ServiceException(INVOICE_TITLE_TAXPAYERID_EXISTS_ERROR);
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+21
View File
@@ -643,6 +643,11 @@ public class PayOrderServiceImpl implements PayOrderService {
if (ObjectUtil.isNotNull(payOrderDO) && ObjectUtil.isNotNull(payOrderDO.getPurchaseId())) {
Long organId = payOrderDO.getOrganId();
// 支付订单的金额
BigDecimal price = payOrderDO.getPrice();
// 订单流水号
String payNo = payOrderDO.getPayNo();
// 1、更新购买记录的开票状态
long purchaseId = payOrderDO.getPurchaseId();
purchaseService.updateRecordInvoicable(purchaseId, organId);
@@ -658,6 +663,22 @@ public class PayOrderServiceImpl implements PayOrderService {
// 4、激活本次的购买记录
purchaseService.activateHistoryOrganProductPurchaseRecord(organId, purchaseId);
// 5.如果是纯第三方支付需要新增收支明细
Integer paymentMethod = record.getPaymentMethod();
if (PayProductChannelCodeEnum.ALIPAY_PC.getCode().equals(paymentMethod) || PayProductChannelCodeEnum.WECHAT_NATIVE.getCode().equals(paymentMethod)) {
IncomeExpenseDetailsDO incomeExpenseDetailsDO = IncomeExpenseDetailsDO.builder()
.organId(organId)
.orderNo(payNo)
.businessNo(snowflakeSerialNoWorker3rd.nextSerialNo())
.tradeType(TradeTypeEnum.PRODUCT.getCode())
.incomeExpenseType(IncomeExpenseTypeEnum.EXPENSES.getCode())
.cashAmountChange(price)
.build();
incomeExpenseDetailsDO.setCreator(payOrderDO.getCreator());
incomeExpenseDetailsDO.setUpdater(payOrderDO.getUpdater());
incomeExpenseService.createDetail(incomeExpenseDetailsDO);
}
}
}
cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml
+1
View File
@@ -243,6 +243,7 @@ chenfeng:
- income_expense_details
- system_organization_amount
- product_delay_record
- invoice_title_info
use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值
xss:
cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml
+1
View File
@@ -259,6 +259,7 @@ chenfeng:
- income_expense_details
- system_organization_amount
- product_delay_record
- invoice_title_info
use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值
env: # 多环境的配置项