From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 163 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 122 insertions(+), 41 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
index b997a26..f9edb8a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
@@ -4,18 +4,19 @@
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
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.contract.vo.contract.CrmContractPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractTransferReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractConfigDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractProductDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationProductDO;
import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractMapper;
import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractProductMapper;
import cn.iocoder.yudao.module.crm.dal.redis.no.CrmNoRedisDAO;
@@ -25,16 +26,21 @@
import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPermission;
import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
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.crm.service.permission.bo.CrmPermissionTransferReqBO;
-import cn.iocoder.yudao.module.crm.service.product.CrmProductService;
+import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationService;
import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderCreateReqDTO;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.service.impl.DiffParseFunction;
import com.mzt.logapi.starter.annotation.LogRecord;
@@ -47,14 +53,19 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
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;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/**
* CRM 鍚堝悓 Service 瀹炵幇绫�
@@ -67,9 +78,11 @@
public class CrmContractServiceImpl implements CrmContractService {
/**
- * BPM 鍚堝悓瀹℃壒娴佺▼鏍囪瘑
+ * CRM 鍚堝悓瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鎵逛汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
*/
- public static final String BPM_PROCESS_DEFINITION_KEY = "crm-contract-audit";
+ private static final String CONTRACT_APPROVE_BIZ_TYPE = "contract_approve";
@Resource
private CrmContractMapper contractMapper;
@@ -82,9 +95,9 @@
@Resource
private CrmPermissionService crmPermissionService;
@Resource
- private CrmProductService productService;
- @Resource
private CrmCustomerService customerService;
+ @Resource
+ private CrmCustomerApi customerApi;
@Resource
private CrmBusinessService businessService;
@Resource
@@ -97,9 +110,14 @@
@Resource
private AdminUserApi adminUserApi;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ @Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧栵紙quotation 鍐呴儴寮曠敤浜� contractService锛�
+ private CrmSaleQuotationService crmSaleQuotationService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -117,7 +135,9 @@
}
// 2.1 鎻掑叆鍚堝悓
- CrmContractDO contract = BeanUtils.toBean(createReqVO, CrmContractDO.class).setNo(no);
+ CrmContractDO contract = BeanUtils.toBean(createReqVO, CrmContractDO.class)
+ .setNo(no)
+ .setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus()); // 榛樿涓烘湭鎻愪氦鐘舵��
calculateTotalPrice(contract, contractProducts);
contractMapper.insert(contract);
// 2.2 鎻掑叆鍚堝悓鍏宠仈鍟嗗搧
@@ -213,11 +233,19 @@
}
private List<CrmContractProductDO> validateContractProducts(List<CrmContractSaveReqVO.Product> list) {
- // 1. 鏍￠獙浜у搧瀛樺湪
- productService.validProductList(convertSet(list, CrmContractSaveReqVO.Product::getProductId));
+ // 1. 鏍￠獙鐗╂枡瀛樺湪涓斿惎鐢�
+ Set<Long> itemIds = convertSet(list, CrmContractSaveReqVO.Product::getItemId);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(itemIds);
// 2. 杞寲涓� CrmContractProductDO 鍒楄〃
- return convertList(list, o -> BeanUtils.toBean(o, CrmContractProductDO.class,
- item -> item.setTotalPrice(MoneyUtils.priceMultiply(item.getContractPrice(), item.getCount()))));
+ return convertList(list, o -> BeanUtils.toBean(o, CrmContractProductDO.class, item -> {
+ MdmItemRespDTO mdmItem = itemMap.get(item.getItemId());
+ if (mdmItem == null) {
+ throw exception(PRODUCT_NOT_EXISTS);
+ }
+ item.setItemUnitId(mdmItem.getUnitMeasureId());
+ item.setItemPrice(mdmItem.getSalesPrice());
+ item.setTotalPrice(MoneyUtils.priceMultiply(item.getContractPrice(), item.getCount()));
+ }));
}
private void calculateTotalPrice(CrmContractDO contract, List<CrmContractProductDO> contractProducts) {
@@ -241,6 +269,11 @@
// 2.1 鍒犻櫎鍚堝悓
contractMapper.deleteById(id);
+ // 2.2 鍒犻櫎鍚堝悓鏃讹紝瑙ｉ櫎鍏宠仈鐨勬姤浠峰崟寮曠敤
+ CrmSaleQuotationDO quotation = crmSaleQuotationService.getByContractId(id);
+ if (quotation != null) {
+ crmSaleQuotationService.clearContractReference(quotation.getId());
+ }
// 2.2 鍒犻櫎鏁版嵁鏉冮檺
crmPermissionService.deletePermission(CrmBizTypeEnum.CRM_CONTRACT.getType(), id);
@@ -254,6 +287,20 @@
throw exception(CONTRACT_NOT_EXISTS);
}
return contract;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
@Override
@@ -294,39 +341,53 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_CONTRACT_SUBMIT_SUCCESS)
- public void submitContract(Long id, Long userId) {
- // 1. 鏍￠獙鍚堝悓鏄惁鍦ㄥ鎵�
+ public void submitContract(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmContractDO contract = validateContractExists(id);
- if (ObjUtil.notEqual(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(CONTRACT_SUBMIT_FAIL_NOT_DRAFT);
+ if (ObjUtil.notEqual(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(contract.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(CONTRACT_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 2. 鍒涘缓鍚堝悓瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY).setBusinessKey(String.valueOf(id)));
+ // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(CONTRACT_APPROVE_BIZ_TYPE);
- // 3. 鏇存柊鍚堝悓宸ヤ綔娴佺紪鍙�
- contractMapper.updateById(new CrmContractDO().setId(id).setProcessInstanceId(processInstanceId)
- .setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus()));
+ // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
- // 3. 璁板綍鏃ュ織
+ // 4. 璁板綍鏃ュ織
LogRecordContext.putVariable("contractName", contract.getName());
}
@Override
- public void updateContractAuditStatus(Long id, Integer bpmResult) {
- // 1.1 鏍￠獙鍚堝悓鏄惁瀛樺湪
- CrmContractDO contract = validateContractExists(id);
- // 1.2 鍙湁瀹℃壒涓紝鍙互鏇存柊瀹℃壒缁撴灉
- if (ObjUtil.notEqual(contract.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
- log.error("[updateContractAuditStatus][contract({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- contract.getId(), bpmResult);
- throw exception(CONTRACT_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
+ public Set<Long> getContractApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(CONTRACT_APPROVE_BIZ_TYPE);
+ }
- // 2. 鏇存柊鍚堝悓瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- contractMapper.updateById(new CrmContractDO().setId(id).setAuditStatus(auditStatus));
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditContract(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ CrmContractDO contract = validateContractExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
+ if (ObjUtil.notEqual(contract.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(CONTRACT_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝鐘舵�佺疆涓哄鏍镐笉閫氳繃锛岄��鍥炴彁浜や汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(CONTRACT_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
+ contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
}
// ======================= 鏌ヨ鐩稿叧 =======================
@@ -363,8 +424,10 @@
return PageResult.empty();
}
}
- // 2. 鏌ヨ鍒嗛〉
- return contractMapper.selectPage(pageReqVO, userId, config);
+ // 2. 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedCustomerIds = customerApi.getPermittedCustomerIds();
+ // 3. 鏌ヨ鍒嗛〉
+ return contractMapper.selectPage(pageReqVO, userId, config, permittedCustomerIds);
}
@Override
@@ -448,14 +511,15 @@
createReqDTO.setContractNo(contract.getNo());
createReqDTO.setSaleUserId(contract.getOwnerUserId());
createReqDTO.setOrderTime(LocalDateTime.now().toString());
- createReqDTO.setDiscountPercent(contract.getDiscountPercent());
+ createReqDTO.setDiscountPercent(contract.getDiscountPercent() != null ? contract.getDiscountPercent() : BigDecimal.ZERO);
+ createReqDTO.setDepositPrice(contract.getDepositPrice() != null ? contract.getDepositPrice() : BigDecimal.ZERO);
createReqDTO.setRemark("鐢卞悎鍚屻��" + contract.getNo() + "銆戣嚜鍔ㄧ敓鎴�");
// 5. 鏋勫缓璁㈠崟椤�
List<ErpSaleOrderCreateReqDTO.Item> items = contractProducts.stream()
.map(cp -> {
ErpSaleOrderCreateReqDTO.Item item = new ErpSaleOrderCreateReqDTO.Item();
- item.setProductId(cp.getProductId());
+ item.setProductId(cp.getItemId());
item.setProductPrice(cp.getContractPrice());
item.setCount(cp.getCount());
return item;
@@ -480,4 +544,21 @@
return orderId;
}
+ @Override
+ public void updateContractStatus(Long id, Integer status) {
+ contractMapper.updateById(new CrmContractDO()
+ .setId(id)
+ .setAuditStatus(status));
+ }
+
+ @Override
+ public void updateContractStatusByOrderId(Long orderId, Integer status) {
+ CrmContractDO contract = contractMapper.selectByOrderId(orderId);
+ if (contract != null) {
+ contractMapper.updateById(new CrmContractDO()
+ .setId(contract.getId())
+ .setAuditStatus(status));
+ }
+ }
+
}
--
Gitblit v1.9.3