From 8ad99e5f72085d14fd56e8faa7aa36701823c8b5 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:16:23 +0800
Subject: [PATCH] feat(crm): 统一客户团队数据权限并放开开票金额上限
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 308 insertions(+), 37 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 1ce3f41..3052329 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,20 +4,28 @@
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.hutool.extra.spring.SpringUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
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.CrmContractImportExcelVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportRespVO;
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.customer.CrmCustomerDO;
+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.mysql.customer.CrmCustomerMapper;
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;
@@ -29,14 +37,19 @@
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.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
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;
@@ -49,7 +62,11 @@
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.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -58,7 +75,7 @@
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 瀹炵幇绫�
@@ -71,22 +88,29 @@
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";
+
+ /**
+ * CRM 鍚堝悓瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String CONTRACT_APPROVE_PROCESS_KEY = "contract_approve";
@Resource
private CrmContractMapper contractMapper;
@Resource
private CrmContractProductMapper contractProductMapper;
+ @Resource
+ private CrmCustomerMapper customerMapper;
@Resource
private CrmNoRedisDAO noRedisDAO;
@Resource
private CrmPermissionService crmPermissionService;
- @Resource
- private CrmProductService productService;
@Resource
private CrmCustomerService customerService;
@Resource
@@ -101,11 +125,16 @@
@Resource
private AdminUserApi adminUserApi;
@Resource
+ private ApprovalConfigApi approvalConfigApi;
+ @Resource
private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ @Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧栵紙quotation 鍐呴儴寮曠敤浜� contractService锛�
+ private CrmSaleQuotationService crmSaleQuotationService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -123,7 +152,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 鎻掑叆鍚堝悓鍏宠仈鍟嗗搧
@@ -136,6 +167,9 @@
crmPermissionService.createPermission(new CrmPermissionCreateReqBO().setUserId(contract.getOwnerUserId())
.setBizType(CrmBizTypeEnum.CRM_CONTRACT.getType()).setBizId(contract.getId())
.setLevel(CrmPermissionLevelEnum.OWNER.getLevel()));
+ // 3.1 瀹㈡埛璐熻矗浜鸿嚜鍔ㄦ嫢鏈夎鍚堝悓鐨勮鍐欐潈闄�
+ crmPermissionService.createPermissionForCustomerOwner(CrmBizTypeEnum.CRM_CONTRACT.getType(),
+ contract.getId(), contract.getCustomerId(), contract.getOwnerUserId());
// 4. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
LogRecordContext.putVariable("contract", contract);
@@ -152,9 +186,9 @@
updateReqVO.setOwnerUserId(null); // 涓嶅厑璁告洿鏂扮殑瀛楁
// 1.1 鏍￠獙瀛樺湪
CrmContractDO oldContract = validateContractExists(updateReqVO.getId());
- // 1.2 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
+ // 1.2 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ョ紪杈戯紱
if (!ObjectUtils.equalsAny(oldContract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
- CrmAuditStatusEnum.PROCESS.getStatus())) {
+ CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(CONTRACT_UPDATE_FAIL_NOT_DRAFT);
}
// 1.3 鏍￠獙浜у搧椤圭殑鏈夋晥鎬�
@@ -248,13 +282,23 @@
public void deleteContract(Long id) {
// 1.1 鏍￠獙瀛樺湪
CrmContractDO contract = validateContractExists(id);
- // 1.2 濡傛灉琚� CrmReceivableDO 鎵�浣跨敤锛屽垯涓嶅厑璁稿垹闄�
+ // 1.2 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ュ垹闄わ紱
+ if (!ObjectUtils.equalsAny(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(CONTRACT_DELETE_FAIL_NOT_EDITABLE);
+ }
+ // 1.3 濡傛灉琚� CrmReceivableDO 鎵�浣跨敤锛屽垯涓嶅厑璁稿垹闄�
if (receivableService.getReceivableCountByContractId(contract.getId()) > 0) {
throw exception(CONTRACT_DELETE_FAIL);
}
// 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);
@@ -268,6 +312,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
@@ -308,39 +366,85 @@
@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. 鏍￠獙鍚堝悓鏄惁鍦ㄥ鎵�
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
+ 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. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ if (contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(CONTRACT_SUBMIT_FAIL_NOT_EDITABLE);
+ }
- // 3. 璁板綍鏃ュ織
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(CONTRACT_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 5. 璁板綍鏃ュ織
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);
+ }
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateContractAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓哄悎鍚屽鏍哥姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer auditStatus;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ if (contractMapper.updateAuditStatusByBpm(id, auditStatus, reason) != 1) {
+ log.warn("[updateContractAuditStatus] 鍚堝悓({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
// ======================= 鏌ヨ鐩稿叧 =======================
@@ -378,6 +482,8 @@
}
}
// 2. 鏌ヨ鍒嗛〉
+ // 鍚堝悓鍙鎬у畬鍏ㄧ敱 appendPermissionCondition 鎺у埗锛堝悎鍚屽洟闃� 鈭� 瀹㈡埛鍥㈤槦锛夛紝
+ // 涓嶅啀棰濆鎸夈�屾湁鏉冮檺鐨勫鎴枫�嶈繃婊わ紝鍚﹀垯涓嶅湪瀹㈡埛鍥㈤槦銆佷絾灞炰簬鍚堝悓璐熻矗浜�/鍚堝悓鍥㈤槦鐨勭敤鎴蜂細琚敊璇繃婊ゆ帀
return contractMapper.selectPage(pageReqVO, userId, config);
}
@@ -439,7 +545,8 @@
@CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
public Long generateSaleOrder(Long id, Long userId) {
// 1. 鏍￠獙鍚堝悓瀛樺湪涓斿凡瀹℃壒閫氳繃
- CrmContractDO contract = validateContractExists(id);
+ CrmContractDO contract = contractMapper.selectByIdForUpdate(id);
+ if (contract == null) throw exception(CONTRACT_NOT_EXISTS);
if (!CrmAuditStatusEnum.APPROVE.getStatus().equals(contract.getAuditStatus())) {
throw exception(CONTRACT_GENERATE_ORDER_FAIL_NOT_APPROVE);
}
@@ -462,7 +569,8 @@
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. 鏋勫缓璁㈠崟椤�
@@ -472,6 +580,10 @@
item.setProductId(cp.getItemId());
item.setProductPrice(cp.getContractPrice());
item.setCount(cp.getCount());
+ // 鍚堝悓浜у搧榛樿闇�瑕佺敓浜э細璁㈠崟瀹℃壒閫氳繃鍚庢墠鑳借嚜鍔ㄥ垱寤� MPS锛�
+ // 鍚﹀垯銆屽悎鍚� 鈫� 璁㈠崟 鈫� 鐢熶骇銆嶉摼璺湪鍚堝悓鏉ユ簮鐨勮鍗曚笂浼氭柇鎺夈��
+ // 鑻ヤ釜鍒骇鍝佷负澶栬喘/杞敭锛屽彲鍦ㄩ攢鍞鍗曟槑缁嗕腑鎶娿�岄渶瑕佺敓浜с�嶆敼涓哄惁銆�
+ item.setNeedProduction(1);
return item;
})
.toList();
@@ -494,4 +606,163 @@
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));
+ }
+ }
+
+ @Override
+ public CrmContractImportRespVO importContractList(List<CrmContractImportExcelVO> rows, CrmContractImportReqVO req) {
+ if (CollUtil.isEmpty(rows)) throw exception(CONTRACT_IMPORT_LIST_IS_EMPTY);
+ Long ownerId = req.getOwnerUserId() != null ? req.getOwnerUserId() : getLoginUserId();
+ adminUserApi.validateUser(ownerId);
+ CrmContractImportRespVO result = CrmContractImportRespVO.builder()
+ .createContractNames(new ArrayList<>()).updateContractNames(new ArrayList<>())
+ .failureContractNames(new LinkedHashMap<>()).build();
+ Map<String, List<CrmContractImportExcelVO>> groups = new LinkedHashMap<>();
+ int rowNo = 0;
+ for (CrmContractImportExcelVO row : rows) {
+ rowNo++;
+ if (row == null) continue;
+ if (StrUtil.isBlank(row.getName()) && StrUtil.isBlank(row.getCustomerName()) && StrUtil.isBlank(row.getProductCode())) continue;
+ if (StrUtil.isBlank(row.getName()) || StrUtil.isBlank(row.getCustomerName())) {
+ throw exception(CONTRACT_IMPORT_INVALID, "绗�" + rowNo + "琛屽悎鍚屽悕绉板拰瀹㈡埛鍚嶇О涓嶈兘涓虹┖");
+ }
+ String key = row.getCustomerName().trim() + " / " + row.getName().trim();
+ groups.computeIfAbsent(key, ignored -> new ArrayList<>()).add(row);
+ }
+ if (groups.isEmpty() && result.getFailureContractNames().isEmpty()) throw exception(CONTRACT_IMPORT_LIST_IS_EMPTY);
+ groups.forEach((key, group) -> {
+ try {
+ boolean created = getSelf().importContractGroup(group, ownerId, Boolean.TRUE.equals(req.getUpdateSupport()));
+ (created ? result.getCreateContractNames() : result.getUpdateContractNames()).add(key);
+ } catch (ServiceException ex) {
+ result.getFailureContractNames().put(key, ex.getMessage());
+ }
+ });
+ return result;
+ }
+
+ /** 涓�寮犲悎鍚屽強鍏ㄩ儴鏄庣粏鍦ㄥ悓涓�浜嬪姟涓繚瀛樸�� */
+ @Transactional(rollbackFor = Exception.class)
+ public boolean importContractGroup(List<CrmContractImportExcelVO> rows, Long ownerId, boolean updateSupport) {
+ CrmContractImportExcelVO first = rows.get(0);
+ CrmCustomerDO customer = customerMapper.selectByCustomerName(first.getCustomerName().trim());
+ if (customer == null) throw exception(CONTRACT_IMPORT_CUSTOMER_NOT_EXISTS, first.getCustomerName());
+ CrmContractDO existing = contractMapper.selectByNameAndCustomerId(first.getName().trim(), customer.getId());
+ if (existing != null && !updateSupport) throw exception(CONTRACT_NAME_EXISTS, first.getName());
+ if (existing != null && !ObjectUtils.equalsAny(existing.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(CONTRACT_UPDATE_FAIL_NOT_DRAFT);
+ }
+ if (first.getDiscountPercent() != null && (first.getDiscountPercent().signum() < 0 || first.getDiscountPercent().compareTo(new BigDecimal("100")) > 0)) {
+ throw exception(CONTRACT_IMPORT_INVALID, "鎶樻墸蹇呴』鍦� 0 鍒� 100 涔嬮棿");
+ }
+ if (first.getStartTime() != null && first.getEndTime() != null && first.getEndTime().isBefore(first.getStartTime())) {
+ throw exception(CONTRACT_IMPORT_INVALID, "缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+ }
+ List<CrmContractSaveReqVO.Product> products = new ArrayList<>();
+ for (CrmContractImportExcelVO row : rows) {
+ if (row.getOrderDate() != null && !row.getOrderDate().equals(first.getOrderDate())
+ || row.getDiscountPercent() != null && (first.getDiscountPercent() == null || row.getDiscountPercent().compareTo(first.getDiscountPercent()) != 0)) {
+ throw exception(CONTRACT_IMPORT_INVALID, "鍚屼竴鍚堝悓鐨勪笅鍗曟棩鏈熷拰鎶樻墸蹇呴』涓�鑷�");
+ }
+ if (row.getStartTime() != null && !row.getStartTime().equals(first.getStartTime())
+ || row.getEndTime() != null && !row.getEndTime().equals(first.getEndTime())
+ || row.getTotalPrice() != null && (first.getTotalPrice() == null || row.getTotalPrice().compareTo(first.getTotalPrice()) != 0)
+ || row.getDepositPrice() != null && (first.getDepositPrice() == null || row.getDepositPrice().compareTo(first.getDepositPrice()) != 0)
+ || StrUtil.isNotBlank(row.getContractType()) && !StrUtil.equals(row.getContractType(), first.getContractType())
+ || StrUtil.isNotBlank(row.getVoltageLevel()) && !StrUtil.equals(row.getVoltageLevel(), first.getVoltageLevel())
+ || StrUtil.isNotBlank(row.getElectricityType()) && !StrUtil.equals(row.getElectricityType(), first.getElectricityType())
+ || row.getContractCapacity() != null && (first.getContractCapacity() == null || row.getContractCapacity().compareTo(first.getContractCapacity()) != 0)
+ || StrUtil.isNotBlank(row.getTariffMode()) && !StrUtil.equals(row.getTariffMode(), first.getTariffMode())
+ || StrUtil.isNotBlank(row.getMeterMode()) && !StrUtil.equals(row.getMeterMode(), first.getMeterMode())
+ || row.getPayCycle() != null && !row.getPayCycle().equals(first.getPayCycle())
+ || StrUtil.isNotBlank(row.getRemark()) && !StrUtil.equals(row.getRemark(), first.getRemark())) {
+ throw exception(CONTRACT_IMPORT_INVALID, "鍚屼竴鍚堝悓鐨勪富琛ㄤ俊鎭繀椤讳竴鑷�");
+ }
+ boolean hasDetail = StrUtil.isNotBlank(row.getProductCode()) || row.getProductPrice() != null || row.getProductCount() != null;
+ if (!hasDetail) continue;
+ if (StrUtil.isBlank(row.getProductCode()) || row.getProductPrice() == null || row.getProductPrice().signum() < 0 || row.getProductCount() == null || row.getProductCount() <= 0) {
+ throw exception(CONTRACT_IMPORT_INVALID, "鐗╂枡缂栫爜銆侀潪璐熷悎鍚屽崟浠峰拰澶т簬闆剁殑鏁存暟鏁伴噺蹇呴』鍚屾椂濉啓");
+ }
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(row.getProductCode().trim()).getCheckedData();
+ if (item == null) throw exception(CONTRACT_IMPORT_INVALID, "鐗╂枡涓嶅瓨鍦細" + row.getProductCode());
+ CrmContractSaveReqVO.Product product = new CrmContractSaveReqVO.Product();
+ product.setItemId(item.getId());
+ product.setItemPrice(item.getSalesPrice());
+ product.setContractPrice(row.getProductPrice());
+ product.setCount(row.getProductCount());
+ products.add(product);
+ }
+ if (!products.isEmpty() && products.size() != rows.size()) throw exception(CONTRACT_IMPORT_INVALID, "鍚屼竴鍚堝悓鐨勬瘡涓�琛岄兘蹇呴』濉啓浜у搧鏄庣粏");
+ CrmContractDO contract = BeanUtils.toBean(first, CrmContractDO.class).setCustomerId(customer.getId());
+ contract.setName(first.getName().trim());
+ if (existing == null) {
+ String no = noRedisDAO.generate(CrmNoRedisDAO.CONTRACT_NO_PREFIX);
+ if (contractMapper.selectByNo(no) != null) throw exception(CONTRACT_NO_EXISTS);
+ contract.setNo(no).setOwnerUserId(ownerId).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
+ if (contract.getOrderDate() == null) contract.setOrderDate(LocalDateTime.now());
+ if (contract.getDiscountPercent() == null) contract.setDiscountPercent(BigDecimal.ZERO);
+ if (!products.isEmpty() || contract.getTotalPrice() == null) calculateTotalPrice(contract, validateContractProducts(products));
+ contractMapper.insert(contract);
+ crmPermissionService.createPermission(new CrmPermissionCreateReqBO().setBizType(CrmBizTypeEnum.CRM_CONTRACT.getType()).setBizId(contract.getId()).setUserId(ownerId).setLevel(CrmPermissionLevelEnum.OWNER.getLevel()));
+ // 瀹㈡埛璐熻矗浜鸿嚜鍔ㄦ嫢鏈夎鍚堝悓鐨勮鍐欐潈闄�
+ crmPermissionService.createPermissionForCustomerOwner(CrmBizTypeEnum.CRM_CONTRACT.getType(),
+ contract.getId(), customer.getId(), ownerId);
+ } else {
+ contract.setId(existing.getId());
+ List<CrmContractProductDO> amountDetails = products.isEmpty()
+ ? contractProductMapper.selectListByContractId(existing.getId()) : validateContractProducts(products);
+ if (CollUtil.isNotEmpty(amountDetails)) {
+ if (contract.getDiscountPercent() == null) contract.setDiscountPercent(
+ existing.getDiscountPercent() == null ? BigDecimal.ZERO : existing.getDiscountPercent());
+ calculateTotalPrice(contract, amountDetails);
+ }
+ contractMapper.updateById(contract);
+ }
+ if (!products.isEmpty()) {
+ List<CrmContractProductDO> details = validateContractProducts(products);
+ if (existing != null) contractProductMapper.delete(CrmContractProductDO::getContractId, existing.getId());
+ details.forEach(detail -> detail.setContractId(contract.getId()));
+ contractProductMapper.insertBatch(details);
+ }
+ getSelf().importContractLog(contract, existing != null);
+ return existing == null;
+ }
+
+
+ /**
+ * 璁板綍瀵煎叆鍚堝悓鏃剁殑鎿嶄綔鏃ュ織
+ *
+ * @param contract 鍚堝悓淇℃伅
+ * @param isUpdate 鏄惁鏇存柊锛泃rue - 鏇存柊锛宖alse - 鏂板
+ */
+ @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_IMPORT_SUB_TYPE, bizNo = "{{#contract.id}}",
+ success = CRM_CONTRACT_IMPORT_SUCCESS)
+ public void importContractLog(CrmContractDO contract, boolean isUpdate) {
+ LogRecordContext.putVariable("contract", contract);
+ LogRecordContext.putVariable("isUpdate", isUpdate);
+ }
+
+ /**
+ * 鑾峰緱鑷韩鐨勪唬鐞嗗璞★紝瑙ｅ喅 AOP 鐢熸晥闂
+ *
+ * @return 鑷繁
+ */
+ private CrmContractServiceImpl getSelf() {
+ return SpringUtil.getBean(getClass());
+ }
+
}
--
Gitblit v1.9.3