From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 164 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
index 91b18a7..08d647c 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
@@ -13,12 +13,19 @@
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.invoice.CrmInvoiceDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableItemDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
+import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivableItemMapper;
import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivableMapper;
import cn.iocoder.yudao.module.crm.dal.redis.no.CrmNoRedisDAO;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
+import cn.iocoder.yudao.module.crm.enums.receivable.CrmReceivableBizTypeEnum;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
+import cn.iocoder.yudao.module.mes.api.productsales.MesWmProductSalesApi;
+import cn.iocoder.yudao.module.mes.api.productsales.dto.MesWmProductSalesRespDTO;
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.invoice.CrmInvoiceService;
@@ -54,6 +61,13 @@
@Resource
private CrmReceivableMapper receivableMapper;
+ @Resource
+ private CrmReceivableItemMapper receivableItemMapper;
+
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private MesWmProductSalesApi productSalesApi;
@Resource
private CrmNoRedisDAO noRedisDAO;
@@ -96,7 +110,8 @@
CrmReceivableDO receivable = BeanUtils.toBean(createReqVO, CrmReceivableDO.class)
.setNo(no).setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus());
receivableMapper.insert(receivable);
- // 2.2
+ // 2.2 淇濆瓨鏍搁攢鏄庣粏锛堟湭浼犳椂鎸夊叧鑱斿紑绁ㄨ嚜鍔ㄧ敓鎴愪竴鏉★級
+ syncReceivableItems(receivable, createReqVO.getItems());
// 3. 鍒涘缓鏁版嵁鏉冮檺
permissionService.createPermission(new CrmPermissionCreateReqBO().setBizType(CrmBizTypeEnum.CRM_RECEIVABLE.getType())
@@ -112,6 +127,121 @@
LogRecordContext.putVariable("receivable", receivable);
LogRecordContext.putVariable("period", getReceivablePeriod(receivable.getPlanId()));
return receivable.getId();
+ }
+
+ /**
+ * 淇濆瓨鏍搁攢鏄庣粏
+ *
+ * 浼� null 鏃讹細鑻ュ叧鑱斿紑绁紝鑷姩鐢熸垚涓�鏉°�屽紑绁ㄣ�嶆牳閿�鏄庣粏锛涘惁鍒欎笉鐢熸垚銆�
+ */
+ private void syncReceivableItems(CrmReceivableDO receivable,
+ List<CrmReceivableSaveReqVO.ReceivableItem> items) {
+ if (items == null) {
+ if (receivable.getInvoiceId() == null) {
+ return;
+ }
+ CrmReceivableSaveReqVO.ReceivableItem autoItem = new CrmReceivableSaveReqVO.ReceivableItem();
+ autoItem.setBizType(CrmReceivableBizTypeEnum.SALE_INVOICE.getType());
+ autoItem.setBizId(receivable.getInvoiceId());
+ autoItem.setReceiptPrice(receivable.getPrice());
+ items = List.of(autoItem);
+ }
+ // 1. 鏍￠獙骞惰В鏋愭瘡琛屽叧鑱斿崟鎹�
+ List<ResolvedReceivableItem> resolvedItems = new ArrayList<>(items.size());
+ BigDecimal itemPriceSum = BigDecimal.ZERO;
+ for (int i = 0; i < items.size(); i++) {
+ CrmReceivableSaveReqVO.ReceivableItem item = items.get(i);
+ int row = i + 1;
+ CrmReceivableBizTypeEnum bizType = item == null ? null
+ : CrmReceivableBizTypeEnum.valueOf(item.getBizType());
+ if (bizType == null) {
+ throw exception(RECEIVABLE_ITEM_BIZ_TYPE_INVALID, row,
+ item == null ? "鏈～鍐�" : item.getBizType());
+ }
+ if (item.getReceiptPrice() == null || item.getReceiptPrice().compareTo(BigDecimal.ZERO) <= 0) {
+ throw exception(RECEIVABLE_ITEM_PRICE_INVALID, row, bizType.getName(),
+ item.getBizId(), item.getReceiptPrice() == null ? "鏈～鍐�"
+ : item.getReceiptPrice().stripTrailingZeros().toPlainString());
+ }
+ ResolvedReceivableItem resolved = resolveReceivableItem(row, bizType, item.getBizId());
+ // 1.1 宸叉牳閿�閲戦锛堜笉鍚湰鍥炴鍗曪紝閬垮厤缂栬緫鏃舵妸鑷繁绠楄繘鍘伙級
+ BigDecimal receiptedPrice = receivableItemMapper.selectListByBiz(bizType.getType(), item.getBizId()).stream()
+ .filter(old -> ObjectUtil.notEqual(old.getReceivableId(), receivable.getId()))
+ .map(old -> old.getReceiptPrice() == null ? BigDecimal.ZERO : old.getReceiptPrice())
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal remainPrice = resolved.totalPrice.subtract(receiptedPrice);
+ if (item.getReceiptPrice().compareTo(remainPrice) > 0) {
+ throw exception(RECEIVABLE_ITEM_PRICE_EXCEEDS, row, bizType.getName(), resolved.bizNo,
+ item.getReceiptPrice().stripTrailingZeros().toPlainString(),
+ remainPrice.stripTrailingZeros().toPlainString(),
+ resolved.totalPrice.stripTrailingZeros().toPlainString(),
+ receiptedPrice.stripTrailingZeros().toPlainString());
+ }
+ resolved.receiptedPrice = receiptedPrice;
+ resolved.receiptPrice = item.getReceiptPrice();
+ resolved.remark = item.getRemark();
+ resolvedItems.add(resolved);
+ itemPriceSum = itemPriceSum.add(item.getReceiptPrice());
+ }
+ // 2. 鏄庣粏鍚堣蹇呴』绛変簬鍥炴閲戦
+ if (itemPriceSum.compareTo(receivable.getPrice()) != 0) {
+ throw exception(RECEIVABLE_ITEM_SUM_MISMATCH,
+ itemPriceSum.stripTrailingZeros().toPlainString(),
+ receivable.getPrice().stripTrailingZeros().toPlainString());
+ }
+ // 3. 閲嶅缓鏄庣粏
+ receivableItemMapper.deleteByReceivableId(receivable.getId());
+ for (ResolvedReceivableItem resolved : resolvedItems) {
+ receivableItemMapper.insert(CrmReceivableItemDO.builder()
+ .receivableId(receivable.getId()).bizType(resolved.bizType.getType())
+ .bizId(resolved.bizId).bizNo(resolved.bizNo).totalPrice(resolved.totalPrice)
+ .receiptedPrice(resolved.receiptedPrice).receiptPrice(resolved.receiptPrice)
+ .remark(resolved.remark).build());
+ }
+ }
+
+ private ResolvedReceivableItem resolveReceivableItem(int row, CrmReceivableBizTypeEnum bizType, Long bizId) {
+ ResolvedReceivableItem resolved = new ResolvedReceivableItem();
+ resolved.bizType = bizType;
+ resolved.bizId = bizId;
+ switch (bizType) {
+ case SALE_ORDER -> {
+ ErpSaleOrderRespDTO saleOrder = bizId == null ? null : saleOrderApi.getSaleOrder(bizId).getCheckedData();
+ if (saleOrder == null) {
+ throw exception(RECEIVABLE_ITEM_BIZ_NOT_EXISTS, row, bizType.getName(), bizId);
+ }
+ resolved.bizNo = saleOrder.getNo();
+ resolved.totalPrice = saleOrder.getTotalPrice() == null ? BigDecimal.ZERO : saleOrder.getTotalPrice();
+ }
+ case SALE_OUT -> {
+ MesWmProductSalesRespDTO saleOut = bizId == null ? null : productSalesApi.getProductSales(bizId);
+ if (saleOut == null) {
+ throw exception(RECEIVABLE_ITEM_BIZ_NOT_EXISTS, row, bizType.getName(), bizId);
+ }
+ resolved.bizNo = saleOut.getCode();
+ resolved.totalPrice = saleOut.getTotalPrice() == null ? BigDecimal.ZERO : saleOut.getTotalPrice();
+ }
+ case SALE_INVOICE -> {
+ CrmInvoiceDO invoice = bizId == null ? null : invoiceService.getInvoice(bizId);
+ if (invoice == null) {
+ throw exception(RECEIVABLE_ITEM_BIZ_NOT_EXISTS, row, bizType.getName(), bizId);
+ }
+ resolved.bizNo = invoice.getNo();
+ resolved.totalPrice = invoice.getPrice() == null ? BigDecimal.ZERO : invoice.getPrice();
+ }
+ default -> throw exception(RECEIVABLE_ITEM_BIZ_TYPE_INVALID, row, bizType.getType());
+ }
+ return resolved;
+ }
+
+ private static class ResolvedReceivableItem {
+ private CrmReceivableBizTypeEnum bizType;
+ private Long bizId;
+ private String bizNo;
+ private BigDecimal totalPrice;
+ private BigDecimal receiptedPrice;
+ private BigDecimal receiptPrice;
+ private String remark;
}
private void validateReceivablePriceExceedsLimit(CrmReceivableSaveReqVO reqVO) {
@@ -243,6 +373,11 @@
// 2. 鏇存柊鍥炴
CrmReceivableDO updateObj = BeanUtils.toBean(updateReqVO, CrmReceivableDO.class);
receivableMapper.updateById(updateObj);
+ // 2.1 鏇存柊鏍搁攢鏄庣粏锛氫紶浜� items 浠� items 涓哄噯锛涙湭浼犱笖鍏宠仈寮�绁ㄦ椂鎸夊紑绁ㄩ噸寤猴紱鍚﹀垯淇濇寔涓嶅彉
+ if (updateReqVO.getItems() != null
+ || (updateReqVO.getInvoiceId() != null && ObjectUtil.notEqual(updateReqVO.getInvoiceId(), oldReceivable.getInvoiceId()))) {
+ syncReceivableItems(updateObj, updateReqVO.getItems());
+ }
// 3. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
updateReqVO.setOwnerUserId(oldReceivable.getOwnerUserId()); // 閬垮厤鎿嶄綔鏃ュ織鍑虹幇鈥滃垹闄よ礋璐ｄ汉鈥濈殑鎯呭喌
@@ -276,6 +411,16 @@
if (updateCount == 0) {
throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
}
+
+ // 3. 鍥炴璁″垝鍥炲啓瀹為檯鍥炴閲戦涓庣姸鎬�
+ if (receivable.getPlanId() != null) {
+ if (approve) {
+ receivablePlanService.updateReceivablePlanReceipted(receivable.getPlanId(),
+ receivable.getPrice(), receivable.getReturnTime());
+ } else {
+ receivablePlanService.resetReceivablePlanReceipted(receivable.getPlanId());
+ }
+ }
}
@Override
@@ -297,7 +442,9 @@
// 2.1 鍒犻櫎鍥炴
receivableMapper.deleteById(id);
- // 2.2 鍒犻櫎鏁版嵁鏉冮檺
+ // 2.2 鍒犻櫎鏍搁攢鏄庣粏
+ receivableItemMapper.deleteByReceivableId(id);
+ // 2.3 鍒犻櫎鏁版嵁鏉冮檺
permissionService.deletePermission(CrmBizTypeEnum.CRM_RECEIVABLE.getType(), id);
// 3. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
@@ -333,6 +480,21 @@
}
@Override
+ public List<CrmReceivableItemDO> getReceivableItemList(Long receivableId) {
+ return receivableItemMapper.selectListByReceivableId(receivableId);
+ }
+
+ @Override
+ public List<CrmReceivableItemDO> getReceivableItemListByCustomerId(Long customerId) {
+ List<CrmReceivableDO> receivables = receivableMapper.selectListByCustomerId(customerId);
+ if (CollUtil.isEmpty(receivables)) {
+ return ListUtil.empty();
+ }
+ return receivableItemMapper.selectListByReceivableIds(
+ receivables.stream().map(CrmReceivableDO::getId).toList());
+ }
+
+ @Override
@CrmPermission(bizType = CrmBizTypeEnum.CRM_CUSTOMER, bizId = "#pageReqVO.customerId", level = CrmPermissionLevelEnum.READ)
public PageResult<CrmReceivableDO> getReceivablePageByCustomerId(CrmReceivablePageReqVO pageReqVO) {
return receivableMapper.selectPageByCustomerId(pageReqVO);
--
Gitblit v1.9.3