优化

iam/src/main/java/com/baiyue/iam/dto/TenantDtos.java

@@ -26,7 +26,7 @@ public final class TenantDtos {
         @Schema(description = "Enterprise display name / 企业名称", example = "深圳虫虫出海科技有限公司") @NotBlank String tenantName,
         @Schema(description = "Legal entity name / 企业法定名称", example = "深圳虫虫出海科技有限公司") @NotBlank String legalName,
         @Schema(description = "Legal representative / 法定代表人", example = "张三") @NotBlank @Size(max = 64) String legalRepresentative,
-        @Schema(description = "18-character unified social credit code / 18 位统一社会信用代码", example = "91440300MA5EXAMPLE") @NotBlank @Pattern(regexp = "[0-9A-Z]{18}") String unifiedSocialCreditCode,
+        @Schema(description = "Optional while creating a draft; required before review / 创建草稿时选填，送审前必填", example = "91440300MA5EXAMPLE", nullable = true) @Pattern(regexp = "[0-9A-Za-z]{18}") String unifiedSocialCreditCode,
         @Schema(description = "Primary contact / 联系人", example = "张三") @NotBlank String contactName,
         @Schema(description = "Contact phone / 联系电话", example = "13800138000") @NotBlank String contactPhone,
         @Schema(description = "Contact email / 联系邮箱", example = "ops@example.com") @Email String contactEmail,

iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java

@@ -150,6 +150,11 @@ public class ProfileResourceService {
             throw new BizException(ResultCode.CONFLICT,
                     "Unified social credit code already exists / 统一社会信用代码已存在");
         }
+        if (StringUtils.hasText(tenant.getUnifiedSocialCreditCode())
+                && !certificateNo.equals(tenant.getUnifiedSocialCreditCode().trim().toUpperCase())) {
+            throw new BizException(ResultCode.CONFLICT,
+                    "Unified social credit code cannot be changed / 统一社会信用代码已登记，营业执照代码必须与企业主档一致");
+        }
         return certificateNo;
     }
 

iam/src/main/java/com/baiyue/iam/service/TenantService.java

@@ -24,6 +24,7 @@ import com.baiyue.iam.dto.CustomerExportDtos.CustomerExportRow;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -53,7 +54,8 @@ public class TenantService {
     )
     @Transactional
     public TenantResponse register(RegisterRequest request, long operatorId) {
-        if (repository.existsByCreditCode(request.unifiedSocialCreditCode())) {
+        String creditCode = normalizeCreditCode(request.unifiedSocialCreditCode());
+        if (creditCode != null && repository.existsByCreditCode(creditCode)) {
             throw new BizException(ResultCode.CONFLICT, "Enterprise already exists / 企业已存在");
         }
 
@@ -65,7 +67,7 @@ public class TenantService {
         tenant.setStatus("PROFILE_REQUIRED");
         tenant.setLegalName(request.legalName());
         tenant.setLegalRepresentative(request.legalRepresentative());
-        tenant.setUnifiedSocialCreditCode(request.unifiedSocialCreditCode());
+        tenant.setUnifiedSocialCreditCode(creditCode);
         tenant.setContactName(request.contactName());
         tenant.setContactPhone(request.contactPhone());
         tenant.setContactEmail(request.contactEmail());
@@ -332,6 +334,10 @@ public class TenantService {
         return tenant;
     }
 
+    private String normalizeCreditCode(String creditCode) {
+        return StringUtils.hasText(creditCode) ? creditCode.trim().toUpperCase() : null;
+    }
+
     private TenantResponse response(IamTenant tenant) {
         return new TenantResponse(
             tenant.getId(), tenant.getTenantCode(), tenant.getTenantName(), tenant.getStatus(),

iam/src/main/resources/openapi/iam-v1.yaml

@@ -840,12 +840,12 @@ components:
         reviewComment: {type: string}
     RegisterRequest:
       type: object
-      required: [tenantName, legalName, legalRepresentative, unifiedSocialCreditCode, contactName, contactPhone, servicePackage]
+      required: [tenantName, legalName, legalRepresentative, contactName, contactPhone, servicePackage]
       properties:
         tenantName: {type: string, example: 深圳虫虫出海科技有限公司}
         legalName: {type: string, example: 深圳虫虫出海科技有限公司}
         legalRepresentative: {type: string, maxLength: 64, example: 张三}
-        unifiedSocialCreditCode: {type: string, pattern: '^[0-9A-Z]{18}$', example: 91440300MA5ABCDE12}
+        unifiedSocialCreditCode: {type: string, nullable: true, pattern: '^[0-9A-Za-z]{18}$', example: 91440300MA5ABCDE12, description: 创建草稿时选填，送审前必填}
         contactName: {type: string, example: 李四}
         contactPhone: {type: string, example: '13800138000'}
         contactEmail: {type: string, format: email, example: contact@example.com}

iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java

@@ -72,4 +72,26 @@ class MerchantQualificationUploadTest {
         assertEquals("91310101ABCDE12345", tenant.getUnifiedSocialCreditCode());
         verify(tenantRepository).saveTenant(tenant);
     }
+
+    @Test
+    void businessLicenseCannotOverwriteAnEstablishedCreditCode() {
+        TenantRepository tenantRepository = mock(TenantRepository.class);
+        ProfileResourceRepository profileRepository = mock(ProfileResourceRepository.class);
+        ProfileResourceService service = new ProfileResourceService();
+        ReflectionTestUtils.setField(service, "tenantRepository", tenantRepository);
+        ReflectionTestUtils.setField(service, "repository", profileRepository);
+        IamTenant tenant = new IamTenant();
+        tenant.setId(10001L);
+        tenant.setTenantType("MERCHANT");
+        tenant.setStatus("REJECTED");
+        tenant.setUnifiedSocialCreditCode("91330100EXAMPLE001");
+        when(tenantRepository.findTenantForUpdate(10001L)).thenReturn(tenant);
+
+        assertThrows(BizException.class, () -> service.submitQualification(new QualificationSubmissionRequest(
+                10001L, "BUSINESS_LICENSE", "91310101ABCDE12345",
+                "/api/merchant/v1/files/qualifications/license.png", null, true)));
+
+        verify(profileRepository, never()).insertQualification(any());
+        verify(tenantRepository, never()).saveTenant(tenant);
+    }
 }

iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java

@@ -133,6 +133,21 @@ class TenantServiceTest {
         verify(repository, never()).insertReview(any());
     }
 
+    @Test
+    void platformRegistrationAllowsCreditCodeToBeCompletedWithQualificationsLater() {
+        TenantRepository repository = mock(TenantRepository.class);
+        TenantService service = new TenantService();
+        ReflectionTestUtils.setField(service, "repository", repository);
+
+        var created = service.register(new RegisterRequest(
+            "Example Merchant", "Example Merchant Ltd", "Bob", null, "Alice", "13800138000",
+            "alice@example.com", "基础版", null, null, 30, null,
+            null, null, "CNY", null, null), 9001L);
+
+        assertEquals(null, created.unifiedSocialCreditCode());
+        verify(repository).insertTenant(argThat(tenant -> tenant.getUnifiedSocialCreditCode() == null));
+    }
+
     @Test
     void explicitSubmissionRequiresOnlyBusinessLicenseAndLegalPersonIdAndCreatesReview() {
         TenantRepository repository = mock(TenantRepository.class);