diff --git a/crm-lead/src/main/java/com/crm/lead/domain/param/ConvertOpportunityParam.java b/crm-lead/src/main/java/com/crm/lead/domain/param/ConvertOpportunityParam.java index a4a00e2..ee175d9 100644 --- a/crm-lead/src/main/java/com/crm/lead/domain/param/ConvertOpportunityParam.java +++ b/crm-lead/src/main/java/com/crm/lead/domain/param/ConvertOpportunityParam.java @@ -21,9 +21,12 @@ public class ConvertOpportunityParam { @Schema(description = "甲方(自由文本,可空)") private String partyA; - @Schema(description = "意向客户(自由文本,必填)") + @Schema(description = "意向客户(自由文本,必填;票 11 降为名快照,与 customerId 并存)") private String intendedCustomer; + @Schema(description = "意向客户 id(票 11;下拉选客户得到,引用 A4 客户模块。A4 下拉未就绪前可空)") + private Long customerId; + @Schema(description = "地区国标 code(必填)") private String regionCode; diff --git a/crm-lead/src/main/java/com/crm/lead/port/outbound/CreateOpportunityCmd.java b/crm-lead/src/main/java/com/crm/lead/port/outbound/CreateOpportunityCmd.java index 28183c3..6a75470 100644 --- a/crm-lead/src/main/java/com/crm/lead/port/outbound/CreateOpportunityCmd.java +++ b/crm-lead/src/main/java/com/crm/lead/port/outbound/CreateOpportunityCmd.java @@ -8,7 +8,10 @@ package com.crm.lead.port.outbound; * @param opportunityName 商机名称(必填) * @param industryCode 行业字典 code(opportunity.industry,必填) * @param partyA 甲方(自由文本,可空) - * @param intendedCustomer 意向客户(自由文本,必填) + * @param intendedCustomer 意向客户名快照(自由文本;票 11 降为客户名快照,与 customerId 并存) + * @param customerId 意向客户 id(票 11;下拉选客户得到,引用 A4 客户模块)。 + * 暂可空:A4 客户下拉未就绪前前端传 null,商机侧跳过建关联子表; + * A4 就绪后收紧为必填(票 11 终态契约)。 * @param regionCode 地区国标 code(varchar 12,必填) * @param remark 备注(自由文本,可空) * @param sourceLeadName 线索名称快照 @@ -24,6 +27,7 @@ public record CreateOpportunityCmd( String industryCode, String partyA, String intendedCustomer, + Long customerId, String regionCode, String remark, String sourceLeadName, diff --git a/crm-lead/src/main/java/com/crm/lead/service/impl/LeadServiceImpl.java b/crm-lead/src/main/java/com/crm/lead/service/impl/LeadServiceImpl.java index 0e8b854..35044f9 100644 --- a/crm-lead/src/main/java/com/crm/lead/service/impl/LeadServiceImpl.java +++ b/crm-lead/src/main/java/com/crm/lead/service/impl/LeadServiceImpl.java @@ -361,7 +361,8 @@ public class LeadServiceImpl extends BaseServiceImpl try { opportunityId = port.createOpportunity(new CreateOpportunityCmd( lead.getId(), param.getOpportunityName(), param.getIndustryCode(), - param.getPartyA(), param.getIntendedCustomer(), param.getRegionCode(), + param.getPartyA(), param.getIntendedCustomer(), param.getCustomerId(), + param.getRegionCode(), param.getRemark(), lead.getLeadName(), lead.getPhone(), lead.getProductCode(), lead.getOwnerUserId(), lead.getOwnerDeptIdSnapshot(), lead.getPoolId()));