feat（member）：收货地址 admin 接口回填 areaName

AddressRespVO 加 areaName 字段；AddressConvert 补 convert03 （@Mapping areaId→areaName，复用 convertAreaIdToAreaName/AreaUtils.format）， convertList2 自动带出。/member/address/list 返回可读地区名，替代前端展示原始 areaId 编码

feat（member）：收货地址 admin 接口回填 areaName
AddressRespVO 加 areaName 字段；AddressConvert 补 convert03 （@Mapping areaId→areaName，复用 convertAreaIdToAreaName/AreaUtils.format）， convertList2 自动带出。/member/address/list 返回可读地区名，替代前端展示原始 areaId 编码
YunaiV
1 parent 93eabb4e
Showing 4 changed files with 16 additions and 1 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressRespVO.java
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
@@ -26,6 +26,7 @@ public interface ErrorCodeConstants {
     ErrorCode BUSINESS_DELETE_FAIL_CONTRACT_EXISTS = new ErrorCode(1_020_002_001, "商机已关联合同，不能删除");
     ErrorCode BUSINESS_UPDATE_STATUS_FAIL_END_STATUS = new ErrorCode(1_020_002_002, "更新商机状态失败，原因：已经是结束状态");
     ErrorCode BUSINESS_UPDATE_STATUS_FAIL_STATUS_EQUALS = new ErrorCode(1_020_002_003, "更新商机状态失败，原因：已经是该状态");
+    ErrorCode BUSINESS_CONTACT_CUSTOMER_NOT_MATCH = new ErrorCode(1_020_002_004, "商机关联的联系人不属于该客户");
     // ========== 联系人管理 1-020-003-000 ==========
     ErrorCode CONTACT_NOT_EXISTS = new ErrorCode(1_020_003_000, "联系人不存在");
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.crm.service.business;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ObjUtil;
 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;
@@ -15,6 +16,7 @@ import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessProductDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessStatusDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactBusinessDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
 import cn.iocoder.yudao.module.crm.dal.mysql.business.CrmBusinessMapper;
 import cn.iocoder.yudao.module.crm.dal.mysql.business.CrmBusinessProductMapper;
 import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
@@ -194,9 +196,15 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
         if (saveReqVO.getCustomerId() != null) {
             customerService.validateCustomer(saveReqVO.getCustomerId());
         }
-        // 校验联系人
+        // 校验联系人（且必须与商机属于同一客户，避免跨客户关联）
         if (saveReqVO.getContactId() != null) {
             contactService.validateContact(saveReqVO.getContactId());
+            if (saveReqVO.getCustomerId() != null) {
+                CrmContactDO contact = contactService.getContact(saveReqVO.getContactId());
+                if (ObjUtil.notEqual(saveReqVO.getCustomerId(), contact.getCustomerId())) {
+                    throw exception(BUSINESS_CONTACT_CUSTOMER_NOT_MATCH);
+                }
+            }
         }
         // 校验负责人
         if (saveReqVO.getOwnerUserId() != null) {
@@ -16,4 +16,7 @@ public class AddressRespVO extends AddressBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
+    @Schema(description = "地区名称", example = "上海上海市普陀区")
+    private String areaName;
+
 }
@@ -40,6 +40,9 @@ public interface AddressConvert {
         return AreaUtils.format(areaId);
     }
+    @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
+    AddressRespVO convert03(MemberAddressDO bean);
+
     List<AddressRespVO> convertList2(List<MemberAddressDO> list);
 }