From 481eb2249f2886c3a6ea8445820a2ec5f153d4da Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:19:47 +0800
Subject: [PATCH] 销售报价编辑详情返回规格，辅单位
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java | 155 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 56 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 0c68f1e..02dad68 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
@@ -8,12 +8,10 @@
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;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivablePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivableSaveReqVO;
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.CrmReceivablePlanDO;
import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivableMapper;
@@ -23,14 +21,16 @@
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.invoice.CrmInvoiceService;
import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.service.impl.DiffParseFunction;
import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +42,6 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.crm.enums.LogRecordConstants.*;
-import static cn.iocoder.yudao.module.crm.util.CrmAuditStatusUtils.convertBpmResultToAuditStatus;
/**
* CRM 鍥炴 Service 瀹炵幇绫�
@@ -51,13 +50,7 @@
*/
@Service
@Validated
-@Slf4j
public class CrmReceivableServiceImpl implements CrmReceivableService {
-
- /**
- * BPM 鍚堝悓瀹℃壒娴佺▼鏍囪瘑
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "crm-receivable-audit";
@Resource
private CrmReceivableMapper receivableMapper;
@@ -72,30 +65,36 @@
private CrmReceivablePlanService receivablePlanService;
@Resource
private CrmPermissionService permissionService;
+ @Resource
+ private CrmInvoiceService invoiceService;
@Resource
private AdminUserApi adminUserApi;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private StorageAttachmentApi storageAttachmentApi;
@Override
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_RECEIVABLE_TYPE, subType = CRM_RECEIVABLE_CREATE_SUB_TYPE, bizNo = "{{#receivable.id}}",
success = CRM_RECEIVABLE_CREATE_SUCCESS)
public Long createReceivable(CrmReceivableSaveReqVO createReqVO) {
- // 1.1 鏍￠獙鍙洖娆鹃噾棰濊秴杩囦笂闄�
- validateReceivablePriceExceedsLimit(createReqVO);
- // 1.2 鏍￠獙鍏宠仈鏁版嵁瀛樺湪
+ // 1.1 鏍￠獙鍏宠仈鏁版嵁瀛樺湪
validateRelationDataExists(createReqVO);
- // 1.3 鐢熸垚鍥炴缂栧彿
+ // 1.2 鏍￠獙鍏宠仈寮�绁ㄥ悎鏍硷紙瀹℃壒閫氳繃 + 宸蹭笂浼犲彂绁ㄩ檮浠� + 涓庡悎鍚屽尮閰嶏級
+ validateInvoiceForReceivable(createReqVO);
+ // 1.3 鏍￠獙鍙洖娆鹃噾棰濅笉瓒呰繃鍚堝悓鍓╀綑鍙洖娆鹃噾棰�
+ validateReceivablePriceExceedsLimit(createReqVO);
+ // 1.4 鏍￠獙鍙洖娆鹃噾棰濅笉瓒呰繃璇ュ紑绁ㄥ墿浣欏彲鍥炴閲戦锛堝厛寮�绁ㄥ悗鍥炴锛�
+ validateReceivablePriceExceedsInvoiceRemaining(createReqVO);
+ // 1.5 鐢熸垚鍥炴缂栧彿
String no = noRedisDAO.generate(CrmNoRedisDAO.RECEIVABLE_PREFIX);
if (receivableMapper.selectByNo(no) != null) {
throw exception(RECEIVABLE_NO_EXISTS);
}
- // 2.1 鎻掑叆鍥炴
+ // 2.1 鎻掑叆鍥炴锛堝垱寤哄悗鍗充负鏈鏍哥姸鎬侊級
CrmReceivableDO receivable = BeanUtils.toBean(createReqVO, CrmReceivableDO.class)
- .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
+ .setNo(no).setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus());
receivableMapper.insert(receivable);
// 2.2
@@ -118,8 +117,10 @@
private void validateReceivablePriceExceedsLimit(CrmReceivableSaveReqVO reqVO) {
// 1. 璁＄畻鍓╀綑鍙��娆鹃噾棰濓紝涓嶅寘鎷� reqVO 鑷韩
CrmContractDO contract = contractService.validateContract(reqVO.getContractId());
+ // 缁熻鍙ｅ緞锛氳崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛堜笌寮�绁ㄧ骇鏍￠獙銆佺粺璁℃柟娉� selectReceivablePriceMapByContractId 淇濇寔涓�鑷达級
List<CrmReceivableDO> receivables = receivableMapper.selectListByContractIdAndStatus(reqVO.getContractId(),
- Arrays.asList(CrmAuditStatusEnum.APPROVE.getStatus(), CrmAuditStatusEnum.PROCESS.getStatus()));
+ Arrays.asList(CrmAuditStatusEnum.DRAFT.getStatus(), CrmAuditStatusEnum.PROCESS.getStatus(),
+ CrmAuditStatusEnum.APPROVE.getStatus()));
if (reqVO.getId() != null) {
receivables.removeIf(receivable -> ObjectUtil.equal(receivable.getId(), reqVO.getId()));
}
@@ -128,6 +129,56 @@
// 2. 鏍￠獙閲戦鏄惁瓒呰繃
if (reqVO.getPrice().compareTo(notReceivablePrice) > 0) {
throw exception(RECEIVABLE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT, notReceivablePrice);
+ }
+ }
+
+ /**
+ * 鏍￠獙鍏宠仈寮�绁ㄥ悎鏍硷細瀛樺湪銆佸鎵归�氳繃銆佸凡涓婁紶鍙戠エ闄勪欢銆佷笌鎵�閫夊悎鍚屼竴鑷�
+ */
+ private void validateInvoiceForReceivable(CrmReceivableSaveReqVO reqVO) {
+ // 1. 鏍￠獙寮�绁ㄥ瓨鍦�
+ CrmInvoiceDO invoice = invoiceService.getInvoice(reqVO.getInvoiceId());
+ if (invoice == null) {
+ throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_NOT_EXISTS);
+ }
+ // 2. 鏍￠獙寮�绁ㄥ鎵归�氳繃
+ if (ObjectUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
+ throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_NOT_APPROVE);
+ }
+ // 3. 鏍￠獙寮�绁ㄥ凡涓婁紶鍙戠エ闄勪欢
+ if (CollUtil.isEmpty(storageAttachmentApi.listAttachments(
+ StorageRecordTypeEnum.CRM_INVOICE.getType(), invoice.getId()))) {
+ throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_NOT_ATTACHMENT);
+ }
+ // 4. 鏍￠獙寮�绁ㄤ笌鎵�閫夊悎鍚屼竴鑷�
+ if (ObjectUtil.notEqual(invoice.getContractId(), reqVO.getContractId())) {
+ throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_CONTRACT_MISMATCH);
+ }
+ // 5. 鏍￠獙寮�绁ㄤ笌鎵�閫夊悎鍚屽鎴蜂竴鑷达紙闃插尽鑴忔暟鎹細鍚堝悓-寮�绁�-鍥炴涓�瀵瑰瀵瑰锛屽紑绁ㄥ繀椤诲睘浜庤鍚堝悓瀹㈡埛锛�
+ if (reqVO.getCustomerId() != null && ObjectUtil.notEqual(invoice.getCustomerId(), reqVO.getCustomerId())) {
+ throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_CONTRACT_MISMATCH);
+ }
+ }
+
+ /**
+ * 鏍￠獙绱鍥炴閲戦涓嶈秴杩囪寮�绁ㄥ墿浣欏彲鍥炴閲戦锛堝厛寮�绁ㄥ悗鍥炴锛�
+ */
+ private void validateReceivablePriceExceedsInvoiceRemaining(CrmReceivableSaveReqVO reqVO) {
+ // 1. 璁＄畻璇ュ紑绁ㄧ疮璁″洖娆鹃噾棰濓紙涓嶅惈鏈锛岀粺璁″彛寰勫悓鍚堝悓閲戦鏍￠獙锛氳崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛�
+ CrmInvoiceDO invoice = invoiceService.getInvoice(reqVO.getInvoiceId());
+ List<CrmReceivableDO> receivables = receivableMapper.selectListByInvoiceIdAndStatus(reqVO.getInvoiceId(),
+ Arrays.asList(CrmAuditStatusEnum.DRAFT.getStatus(), CrmAuditStatusEnum.PROCESS.getStatus(),
+ CrmAuditStatusEnum.APPROVE.getStatus()));
+ if (reqVO.getId() != null) {
+ receivables.removeIf(receivable -> ObjectUtil.equal(receivable.getId(), reqVO.getId()));
+ }
+ BigDecimal receivablePriceSum = CollectionUtils.getSumValue(receivables, CrmReceivableDO::getPrice,
+ BigDecimal::add, BigDecimal.ZERO);
+
+ // 2. 鏍￠獙鏈鍥炴閲戦涓嶈秴杩囪寮�绁ㄥ墿浣欏彲鍥炴閲戦锛堝紑绁ㄩ噾棰� - 宸插洖娆鹃噾棰濓級
+ BigDecimal availablePrice = invoice.getPrice().subtract(receivablePriceSum);
+ if (reqVO.getPrice().compareTo(availablePrice) > 0) {
+ throw exception(RECEIVABLE_CREATE_FAIL_INVOICE_PRICE_EXCEEDS, availablePrice);
}
}
@@ -160,17 +211,24 @@
@CrmPermission(bizType = CrmBizTypeEnum.CRM_RECEIVABLE, bizId = "#updateReqVO.id", level = CrmPermissionLevelEnum.WRITE)
public void updateReceivable(CrmReceivableSaveReqVO updateReqVO) {
Assert.notNull(updateReqVO.getId(), "鍥炴缂栧彿涓嶈兘涓虹┖");
- updateReqVO.setOwnerUserId(null).setCustomerId(null).setContractId(null).setPlanId(null); // 涓嶅厑璁镐慨鏀圭殑瀛楁
+ updateReqVO.setOwnerUserId(null).setCustomerId(null).setContractId(null).setPlanId(null); // 涓嶅厑璁镐慨鏀圭殑瀛楁锛坕nvoiceId 鍏佽淇敼锛�
// 1.1 鏍￠獙瀛樺湪
CrmReceivableDO oldReceivable = validateReceivableExists(updateReqVO.getId());
updateReqVO.setOwnerUserId(oldReceivable.getOwnerUserId()).setCustomerId(oldReceivable.getCustomerId())
.setContractId(oldReceivable.getContractId()).setPlanId(oldReceivable.getPlanId()); // 璁剧疆宸插瓨鍦ㄧ殑鍊�
- // 1.2 鏍￠獙鍙洖娆鹃噾棰濊秴杩囦笂闄�
+ // 1.2 鑻ユ湭浼犻�掑叧鑱斿紑绁紝娌跨敤鏃у��
+ if (updateReqVO.getInvoiceId() == null) {
+ updateReqVO.setInvoiceId(oldReceivable.getInvoiceId());
+ }
+ // 1.3 鏍￠獙鍙洖娆鹃噾棰濅笉瓒呰繃鍚堝悓鍓╀綑鍙洖娆鹃噾棰�
validateReceivablePriceExceedsLimit(updateReqVO);
+ // 1.4 鏍￠獙鍏宠仈寮�绁ㄥ悎鏍�
+ validateInvoiceForReceivable(updateReqVO);
+ // 1.5 鏍￠獙鍙洖娆鹃噾棰濅笉瓒呰繃璇ュ紑绁ㄥ墿浣欏彲鍥炴閲戦
+ validateReceivablePriceExceedsInvoiceRemaining(updateReqVO);
- // 1.3 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
- if (!ObjectUtils.equalsAny(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
- CrmAuditStatusEnum.PROCESS.getStatus())) {
+ // 1.6 鍙湁鏈鏍革紝鍙互缂栬緫锛�
+ if (ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
throw exception(RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED);
}
@@ -194,19 +252,22 @@
}
@Override
- public void updateReceivableAuditStatus(Long id, Integer bpmResult) {
+ @Transactional(rollbackFor = Exception.class)
+ public void updateReceivableStatus(Long id, Integer status) {
+ boolean approve = CrmAuditStatusEnum.APPROVE.getStatus().equals(status);
// 1.1 鏍￠獙瀛樺湪
CrmReceivableDO receivable = validateReceivableExists(id);
- // 1.2 鍙湁瀹℃壒涓紝鍙互鏇存柊瀹℃壒缁撴灉
- if (ObjUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
- log.error("[updateReceivableAuditStatus][receivable({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- receivable.getId(), bpmResult);
- throw exception(RECEIVABLE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ // 1.2 鏍￠獙鐘舵��
+ if (receivable.getAuditStatus().equals(status)) {
+ throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
}
- // 2. 鏇存柊鍥炴瀹℃壒鐘舵��
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- receivableMapper.updateById(new CrmReceivableDO().setId(id).setAuditStatus(auditStatus));
+ // 2. 鏇存柊鐘舵��
+ int updateCount = receivableMapper.updateByIdAndStatus(id, receivable.getAuditStatus(),
+ new CrmReceivableDO().setAuditStatus(status));
+ if (updateCount == 0) {
+ throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
+ }
}
@Override
@@ -234,29 +295,6 @@
// 3. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
LogRecordContext.putVariable("receivable", receivable);
LogRecordContext.putVariable("period", getReceivablePeriod(receivable.getPlanId()));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = CRM_RECEIVABLE_TYPE, subType = CRM_RECEIVABLE_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
- success = CRM_RECEIVABLE_SUBMIT_SUCCESS)
- public void submitReceivable(Long id, Long userId) {
- // 1. 鏍￠獙鍥炴鏄惁鍦ㄥ鎵�
- CrmReceivableDO receivable = validateReceivableExists(id);
- if (ObjUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT);
- }
-
- // 2. 鍒涘缓鍥炴瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY).setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊鍥炴宸ヤ綔娴佺紪鍙�
- receivableMapper.updateById(new CrmReceivableDO().setId(id).setProcessInstanceId(processInstanceId)
- .setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus()));
-
- // 4. 璁板綍鏃ュ織
- LogRecordContext.putVariable("receivableNo", receivable.getNo());
}
private CrmReceivableDO validateReceivableExists(Long id) {
@@ -303,6 +341,11 @@
}
@Override
+ public Map<Long, BigDecimal> getReceivablePriceMapByInvoiceId(Collection<Long> invoiceIds) {
+ return receivableMapper.selectReceivablePriceMapByInvoiceId(invoiceIds);
+ }
+
+ @Override
public Long getReceivableCountByContractId(Long contractId) {
return receivableMapper.selectCountByContractId(contractId);
}
--
Gitblit v1.9.3