From ccff3913e0e6854a3811788d5d41614463110095 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:44:53 +0800
Subject: [PATCH] feat(crm): 开票管理支持关联销售订单,开票金额按订单未开票金额校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 13 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
index d8df5d2..ba51dbb 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
@@ -6,6 +6,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -26,8 +27,11 @@
import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPermission;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
+import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import com.mzt.logapi.context.LogRecordContext;
@@ -76,6 +80,11 @@
*/
private static final String INVOICE_RECORD_TYPE = "crm_invoice";
+ /**
+ * 閿�鍞鍗曘�屽凡瀹℃牳銆嶇姸鎬侊紝瀵瑰簲 ErpAuditStatus.APPROVE
+ */
+ private static final Integer SALE_ORDER_APPROVE_STATUS = 20;
+
@Resource
private CrmInvoiceMapper invoiceMapper;
@@ -85,8 +94,12 @@
@Resource
private CrmContractService contractService;
@Resource
+ private CrmCustomerService customerService;
+ @Resource
private CrmPermissionService permissionService;
+ @Resource
+ private ErpSaleOrderApi erpSaleOrderApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
@@ -99,10 +112,10 @@
@LogRecord(type = CRM_INVOICE_TYPE, subType = CRM_INVOICE_CREATE_SUB_TYPE, bizNo = "{{#invoice.id}}",
success = CRM_INVOICE_CREATE_SUCCESS)
public Long createInvoice(CrmInvoiceSaveReqVO createReqVO) {
- // 1.1 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
- validateInvoicePriceExceedsLimit(createReqVO);
- // 1.2 鏍¢獙鍏宠仈鏁版嵁瀛樺湪
- validateRelationDataExists(createReqVO);
+ // 1.1 鏍¢獙鍏宠仈鏁版嵁瀛樺湪锛堝叧鑱旈攢鍞鍗曟椂杩斿洖璁㈠崟锛岀敤浜庡洖濉鍗曞彿銆佹牎楠屽紑绁ㄩ搴︼級
+ ErpSaleOrderRespDTO saleOrder = validateRelationDataExists(createReqVO);
+ // 1.2 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
+ validateInvoicePriceExceedsLimit(createReqVO, saleOrder);
// 1.3 纭畾寮�绁ㄧ紪鍙凤紙鍓嶇濉啓鍒欑敤鑷畾涔夊崟鍙凤紝鐣欑┖鍒欒嚜鍔ㄧ敓鎴愶級锛屽苟鏍¢獙鍞竴鎬�
String customNo = StrUtil.trim(createReqVO.getNo());
String no = StrUtil.isNotBlank(customNo) ? customNo
@@ -113,7 +126,8 @@
// 2.1 鎻掑叆寮�绁�
CrmInvoiceDO invoice = BeanUtils.toBean(createReqVO, CrmInvoiceDO.class)
- .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
+ .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus())
+ .setSaleOrderNo(saleOrder != null ? saleOrder.getNo() : null);
invoiceMapper.insert(invoice);
// 2.2 缁戝畾鍙戠エ闄勪欢
@@ -346,7 +360,25 @@
+ "銆嶅畬鍏ㄧ浉鍚岋紙鍙兘鏄湰娆″鍏ュ墠闈㈢殑琛岋紝涔熷彲鑳芥槸绯荤粺涓凡鏈夊崟鎹級銆傝鍕块噸澶嶅鍏ワ紱濡傜‘闇�閲嶆柊瀵煎叆锛岃鍏堝湪銆岃惀閿�绠$悊-寮�绁ㄧ鐞嗐�嶄腑鍒犻櫎璇ュ紑绁ㄥ崟鍚庨噸璇�");
}
- private void validateInvoicePriceExceedsLimit(CrmInvoiceSaveReqVO reqVO) {
+ private void validateInvoicePriceExceedsLimit(CrmInvoiceSaveReqVO reqVO, ErpSaleOrderRespDTO saleOrder) {
+ // 鍏宠仈浜嗛攢鍞鍗曠殑锛屽紑绁ㄩ噾棰濇寜閿�鍞鍗曢噾棰濇牎楠岋紙浼樺厛绾ч珮浜庡悎鍚岋級
+ if (saleOrder != null) {
+ BigDecimal remainPrice = getRemainingInvoicePriceBySaleOrder(saleOrder, reqVO.getId());
+ if (reqVO.getPrice().compareTo(remainPrice) > 0) {
+ throw new ServiceException(INVOICE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT.getCode(),
+ StrUtil.format("寮�绁ㄩ噾棰濊秴杩囬攢鍞鍗昜{}]鍓╀綑鍙紑绁ㄩ噾棰濓細璇ヨ鍗曢噾棰� {} 鍏冿紝宸插紑绁紙鍚鎵逛腑锛墈} 鍏冿紝"
+ + "鍓╀綑鍙紑绁� {} 鍏冿紝鏈濉啓 {} 鍏冦�傝璋冩暣寮�绁ㄩ噾棰濓紝鎴栧厛鍦ㄣ�岃惀閿�绠$悊-寮�绁ㄧ鐞嗐�嶆牳瀵硅鍗曞凡寮�绁ㄩ噾棰濆悗閲嶈瘯銆�",
+ saleOrder.getNo(), saleOrder.getTotalPrice().stripTrailingZeros().toPlainString(),
+ saleOrder.getTotalPrice().subtract(remainPrice).stripTrailingZeros().toPlainString(),
+ remainPrice.stripTrailingZeros().toPlainString(),
+ reqVO.getPrice().stripTrailingZeros().toPlainString()));
+ }
+ return;
+ }
+ // 鏈叧鑱斿悎鍚岀殑锛堝悎鍚岄潪蹇呭~锛夛紝涓嶅崰鐢ㄤ换浣曞悎鍚岀殑寮�绁ㄩ搴︼紝鏃犻渶鏍¢獙涓婇檺
+ if (reqVO.getContractId() == null) {
+ return;
+ }
// 1. 璁$畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堝鎵逛腑涔熷崰鐢ㄩ搴︼紝闃叉绱寮�绁ㄨ秴杩囧悎鍚岄噾棰濓級
CrmContractDO contract = contractService.validateContract(reqVO.getContractId());
BigDecimal notInvoicePrice = getRemainingInvoicePrice(contract, reqVO.getId());
@@ -372,9 +404,50 @@
CollectionUtils.getSumValue(invoices, CrmInvoiceDO::getPrice, BigDecimal::add, BigDecimal.ZERO));
}
- private void validateRelationDataExists(CrmInvoiceSaveReqVO reqVO) {
+ /**
+ * 璁$畻閿�鍞鍗曞墿浣欏彲寮�绁ㄩ噾棰濓紙瀹℃壒涓�佸鏍搁�氳繃鐨勫紑绁ㄥ崰鐢ㄩ搴︼級
+ *
+ * @param saleOrder 閿�鍞鍗�
+ * @param excludeInvoiceId 闇�鎺掗櫎鐨勫紑绁ㄧ紪鍙凤紝鍙负绌�
+ */
+ private BigDecimal getRemainingInvoicePriceBySaleOrder(ErpSaleOrderRespDTO saleOrder, Long excludeInvoiceId) {
+ List<CrmInvoiceDO> invoices = invoiceMapper.selectListBySaleOrderIdAndStatus(saleOrder.getId(),
+ List.of(CrmAuditStatusEnum.APPROVE.getStatus(), CrmAuditStatusEnum.PROCESS.getStatus()));
+ if (excludeInvoiceId != null) {
+ invoices.removeIf(invoice -> ObjectUtil.equal(invoice.getId(), excludeInvoiceId));
+ }
+ return ObjectUtil.defaultIfNull(saleOrder.getTotalPrice(), BigDecimal.ZERO).subtract(
+ CollectionUtils.getSumValue(invoices, CrmInvoiceDO::getPrice, BigDecimal::add, BigDecimal.ZERO));
+ }
+
+ private ErpSaleOrderRespDTO validateRelationDataExists(CrmInvoiceSaveReqVO reqVO) {
if (reqVO.getOwnerUserId() != null) {
adminUserApi.validateUser(reqVO.getOwnerUserId()); // 鏍¢獙璐熻矗浜哄瓨鍦�
+ }
+ // 鍏宠仈閿�鍞鍗曪細璁㈠崟蹇呴』宸插鏍搁�氳繃锛屽鎴蜂互璁㈠崟涓哄噯
+ ErpSaleOrderRespDTO saleOrder = null;
+ if (reqVO.getSaleOrderId() != null) {
+ saleOrder = erpSaleOrderApi.getSaleOrder(reqVO.getSaleOrderId()).getCheckedData();
+ if (saleOrder == null) {
+ throw new ServiceException(INVOICE_CREATE_FAIL_SALE_ORDER_NOT_EXISTS.getCode(),
+ StrUtil.format("鎵�閫夐攢鍞鍗曚笉瀛樺湪锛堢紪鍙� ID={}锛夛紝鍙兘宸茶鍒犻櫎锛岃鍒锋柊鍚庨噸鏂伴�夋嫨", reqVO.getSaleOrderId()));
+ }
+ if (!SALE_ORDER_APPROVE_STATUS.equals(saleOrder.getStatus())) {
+ throw new ServiceException(INVOICE_CREATE_FAIL_SALE_ORDER_NOT_APPROVE.getCode(),
+ StrUtil.format("鎵�閫夐攢鍞鍗昜{}]褰撳墠涓嶆槸銆屽凡瀹℃牳銆嶇姸鎬侊紝鍙湁瀹℃牳閫氳繃鐨勯攢鍞鍗曟墠鑳藉紑绁ㄣ��"
+ + "璇峰厛鍦ㄣ�怑RP-閿�鍞鍗曘�戝畬鎴愯璁㈠崟瀹℃壒锛屾垨鏀归�夊叾浠栧凡瀹℃牳閫氳繃鐨勯攢鍞鍗�", saleOrder.getNo()));
+ }
+ reqVO.setCustomerId(saleOrder.getCustomerId());
+ // 鍚堝悓甯﹀嚭锛氫粎褰撹鍗曞叧鑱旂殑鍚堝悓瀛樺湪涓斿凡瀹℃牳閫氳繃鏃跺洖濉紝閬垮厤鍥犲悎鍚屾湭瀹℃壒鎸′綇鎸夎鍗曞紑绁�
+ if (reqVO.getContractId() == null && saleOrder.getContractId() != null) {
+ CrmContractDO contract = contractService.getContract(saleOrder.getContractId());
+ if (contract != null && ObjectUtil.equal(contract.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
+ reqVO.setContractId(contract.getId());
+ }
+ }
+ }
+ if (reqVO.getCustomerId() != null) {
+ customerService.validateCustomer(reqVO.getCustomerId()); // 鏍¢獙瀹㈡埛瀛樺湪
}
if (reqVO.getContractId() != null) {
CrmContractDO contract = contractService.validateContract(reqVO.getContractId());
@@ -383,6 +456,7 @@
}
reqVO.setCustomerId(contract.getCustomerId()); // 璁剧疆瀹㈡埛缂栧彿
}
+ return saleOrder;
}
@Override
@@ -396,9 +470,11 @@
// 1.1 鏍¢獙瀛樺湪
CrmInvoiceDO oldInvoice = validateInvoiceExists(updateReqVO.getId());
updateReqVO.setOwnerUserId(oldInvoice.getOwnerUserId()).setCustomerId(oldInvoice.getCustomerId())
- .setContractId(oldInvoice.getContractId()); // 璁剧疆宸插瓨鍦ㄧ殑鍊�
- // 1.2 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
- validateInvoicePriceExceedsLimit(updateReqVO);
+ .setContractId(oldInvoice.getContractId()).setSaleOrderId(oldInvoice.getSaleOrderId()); // 璁剧疆宸插瓨鍦ㄧ殑鍊�
+ // 1.2 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄愶紙閿�鍞鍗曚笉鍙慨鏀癸紝鎸夊師璁㈠崟鏍¢獙棰濆害锛�
+ ErpSaleOrderRespDTO saleOrder = updateReqVO.getSaleOrderId() != null
+ ? erpSaleOrderApi.getSaleOrder(updateReqVO.getSaleOrderId()).getCheckedData() : null;
+ validateInvoicePriceExceedsLimit(updateReqVO, saleOrder);
// 1.3 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
if (!ObjectUtils.equalsAny(oldInvoice.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
@@ -407,7 +483,9 @@
}
// 2. 鏇存柊寮�绁�
- CrmInvoiceDO updateObj = BeanUtils.toBean(updateReqVO, CrmInvoiceDO.class);
+ CrmInvoiceDO updateObj = BeanUtils.toBean(updateReqVO, CrmInvoiceDO.class)
+ // 閿�鍞鍗曚笉鍙慨鏀癸紝娌跨敤鍘熷��
+ .setSaleOrderId(oldInvoice.getSaleOrderId()).setSaleOrderNo(oldInvoice.getSaleOrderNo());
invoiceMapper.updateById(updateObj);
// 3. 澧為噺鏇存柊鍙戠エ闄勪欢
@@ -470,9 +548,12 @@
throw exception(INVOICE_SUBMIT_FAIL_NOT_DRAFT);
}
- // 1.1 閲嶆柊鏍¢獙鍙紑绁ㄩ噾棰濓紝闃叉绱寮�绁ㄨ秴杩囧悎鍚岄噾棰濓紙鑽夌鏈熷悗鍙兘鏈夊叾浠栧崟杩涘叆瀹℃壒涓級
+ // 1.1 閲嶆柊鏍¢獙鍙紑绁ㄩ噾棰濓紝闃叉绱寮�绁ㄨ秴杩囧悎鍚�/閿�鍞鍗曢噾棰濓紙鑽夌鏈熷悗鍙兘鏈夊叾浠栧崟杩涘叆瀹℃壒涓級
+ ErpSaleOrderRespDTO saleOrder = invoice.getSaleOrderId() != null
+ ? erpSaleOrderApi.getSaleOrder(invoice.getSaleOrderId()).getCheckedData() : null;
validateInvoicePriceExceedsLimit(new CrmInvoiceSaveReqVO()
- .setId(invoice.getId()).setContractId(invoice.getContractId()).setPrice(invoice.getPrice()));
+ .setId(invoice.getId()).setContractId(invoice.getContractId())
+ .setSaleOrderId(invoice.getSaleOrderId()).setPrice(invoice.getPrice()), saleOrder);
// 2. 鍒涘缓寮�绁ㄥ鎵规祦绋嬪疄渚�
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
@@ -539,4 +620,13 @@
return invoiceMapper.selectCountByContractId(contractId);
}
+ @Override
+ public BigDecimal getSaleOrderRemainInvoicePrice(Long saleOrderId) {
+ ErpSaleOrderRespDTO saleOrder = erpSaleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
+ if (saleOrder == null) {
+ throw exception(INVOICE_CREATE_FAIL_SALE_ORDER_NOT_EXISTS);
+ }
+ return getRemainingInvoicePriceBySaleOrder(saleOrder, null);
+ }
+
}
--
Gitblit v1.9.3