From 6d1bf32bc0b51dc12048fe6bb70badfbd31d67ac Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 13:44:10 +0800
Subject: [PATCH] fix: 修复销售订单审批及开票回款搜索
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 251 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 234 insertions(+), 17 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 f9edb8a..7d122c8 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
@@ -5,20 +5,27 @@
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.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;
@@ -26,18 +33,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.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.mdm.enums.MdmItemTypeEnum;
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;
@@ -57,6 +67,7 @@
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;
@@ -84,10 +95,17 @@
*/
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;
@@ -96,8 +114,6 @@
private CrmPermissionService crmPermissionService;
@Resource
private CrmCustomerService customerService;
- @Resource
- private CrmCustomerApi customerApi;
@Resource
private CrmBusinessService businessService;
@Resource
@@ -111,6 +127,8 @@
private AdminUserApi adminUserApi;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
@Resource
@@ -150,6 +168,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);
@@ -166,9 +187,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 鏍￠獙浜у搧椤圭殑鏈夋晥鎬�
@@ -262,7 +283,12 @@
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);
}
@@ -341,6 +367,7 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_CONTRACT_SUBMIT_SUCCESS)
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
public void submitContract(Long id) {
// 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmContractDO contract = validateContractExists(id);
@@ -353,9 +380,17 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(CONTRACT_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(CONTRACT_SUBMIT_FAIL_NOT_EDITABLE);
+ }
- // 4. 璁板綍鏃ュ織
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(CONTRACT_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 5. 璁板綍鏃ュ織
LogRecordContext.putVariable("contractName", contract.getName());
}
@@ -381,13 +416,36 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(CONTRACT_AUDIT_REJECT_REASON_REQUIRED);
}
- contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ 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);
+ }
}
// ======================= 鏌ヨ鐩稿叧 =======================
@@ -424,10 +482,10 @@
return PageResult.empty();
}
}
- // 2. 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedCustomerIds = customerApi.getPermittedCustomerIds();
- // 3. 鏌ヨ鍒嗛〉
- return contractMapper.selectPage(pageReqVO, userId, config, permittedCustomerIds);
+ // 2. 鏌ヨ鍒嗛〉
+ // 鍚堝悓鍙鎬у畬鍏ㄧ敱 appendPermissionCondition 鎺у埗锛堝悎鍚屽洟闃� 鈭� 瀹㈡埛鍥㈤槦锛夛紝
+ // 涓嶅啀棰濆鎸夈�屾湁鏉冮檺鐨勫鎴枫�嶈繃婊わ紝鍚﹀垯涓嶅湪瀹㈡埛鍥㈤槦銆佷絾灞炰簬鍚堝悓璐熻矗浜�/鍚堝悓鍥㈤槦鐨勭敤鎴蜂細琚敊璇繃婊ゆ帀
+ return contractMapper.selectPage(pageReqVO, userId, config);
}
@Override
@@ -473,8 +531,18 @@
if (config == null || Boolean.FALSE.equals(config.getNotifyEnabled())) {
return 0L;
}
+ // 鎻愰啋澶╂暟鏈厤缃椂鎸夐粯璁� 7 澶╁鐞嗭紝閬垮厤 config.getNotifyDays() 涓� null 鏃舵媶绠辨姏 NPE 瀵艰嚧鎺ュ彛 500
+ if (config.getNotifyDays() == null) {
+ config = BeanUtils.toBean(config, CrmContractConfigDO.class);
+ config.setNotifyDays(DEFAULT_NOTIFY_DAYS);
+ }
return contractMapper.selectCountByRemind(userId, config);
}
+
+ /**
+ * 鍚堝悓鍒版湡鎻愰啋鐨勯粯璁ゆ彁鍓嶅ぉ鏁帮細鍚堝悓鎻愰啋鏈厤缃� notifyDays 鏃朵娇鐢�
+ */
+ private static final Integer DEFAULT_NOTIFY_DAYS = 7;
@Override
public List<CrmContractDO> getContractListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
@@ -488,7 +556,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);
}
@@ -516,12 +585,18 @@
createReqDTO.setRemark("鐢卞悎鍚屻��" + contract.getNo() + "銆戣嚜鍔ㄧ敓鎴�");
// 5. 鏋勫缓璁㈠崟椤�
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(contractProducts, CrmContractProductDO::getItemId));
List<ErpSaleOrderCreateReqDTO.Item> items = contractProducts.stream()
.map(cp -> {
ErpSaleOrderCreateReqDTO.Item item = new ErpSaleOrderCreateReqDTO.Item();
item.setProductId(cp.getItemId());
item.setProductPrice(cp.getContractPrice());
item.setCount(cp.getCount());
+ // 鍙湁浜у搧鎵嶈繘鍏ョ敓浜ц鍒掞紱娓╂帶绛夊璐墿鏂欏彲闅忓悎鍚岃繘鍏ラ攢鍞鍗曪紝
+ // 浣嗕笉鑳藉垱寤� MPS锛屽惁鍒欎細瀵艰嚧鏁寸瑪閿�鍞鍗曞鎵瑰洖婊氥��
+ MdmItemRespDTO mdmItem = itemMap.get(cp.getItemId());
+ item.setNeedProduction(mdmItem != null && MdmItemTypeEnum.isProduct(mdmItem.getItemType()) ? 1 : 0);
return item;
})
.toList();
@@ -561,4 +636,146 @@
}
}
+ @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