优化

firstleg/src/test/java/com/baiyue/firstleg/controller/CustomerDimensionConfigControllerContractTest.java

@@ -33,15 +33,15 @@ class CustomerDimensionConfigControllerContractTest {
 
     @Test
     void internalInitializationRequiresTokenAndReturnsCreationIdentity() {
-        InitializeRequest request = new InitializeRequest(8L, 100L, "registration-1");
-        when(service.initializeDefault(8L, 100L, "registration-1"))
-            .thenReturn(new InitializeResponse(91L, true));
+        InitializeRequest request = new InitializeRequest(8L, 100L, "registration-1", "柏悦物流");
+        when(service.initializeDefault(8L, 100L, "registration-1", "柏悦物流"))
+            .thenReturn(new InitializeResponse(91L, 191L, true));
 
         assertThatThrownBy(() -> internalController.initializeDefault("wrong", request))
             .isInstanceOf(BizException.class);
         assertThat(internalController.initializeDefault("test-token", request).data())
-            .isEqualTo(new InitializeResponse(91L, true));
-        verify(service).initializeDefault(8L, 100L, "registration-1");
+            .isEqualTo(new InitializeResponse(91L, 191L, true));
+        verify(service).initializeDefault(8L, 100L, "registration-1", "柏悦物流");
     }
 
     @Test

firstleg/src/test/java/com/baiyue/firstleg/service/CustomerChargeRuleInitializationServiceTest.java

@@ -0,0 +1,76 @@
+package com.baiyue.firstleg.service;
+
+import com.baiyue.firstleg.entity.CustomerChargeRuleEntity;
+import com.baiyue.firstleg.repository.FbaPricingRepository;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@SpringJUnitConfig(CustomerChargeRuleInitializationService.class)
+class CustomerChargeRuleInitializationServiceTest {
+    @MockBean private FbaPricingRepository repository;
+    @Resource private CustomerChargeRuleInitializationService service;
+
+    @Test
+    void initializesDefaultWeightCoefficientRuleForNewCustomer() {
+        CustomerChargeRuleEntity result = service.initializeDefault(
+            8L, 100L, "iam-customer-create:8", "柏悦物流");
+
+        ArgumentCaptor<CustomerChargeRuleEntity> captor =
+            ArgumentCaptor.forClass(CustomerChargeRuleEntity.class);
+        verify(repository).insertRule(captor.capture());
+        CustomerChargeRuleEntity saved = captor.getValue();
+        assertThat(result).isSameAs(saved);
+        assertThat(saved.getTenantId()).isEqualTo(8L);
+        assertThat(saved.getCustomerId()).isEqualTo(8L);
+        assertThat(saved.getCustomerName()).isEqualTo("柏悦物流");
+        assertThat(saved.getRuleCode()).isEqualTo("DEFAULT-DIMENSION-WEIGHT");
+        assertThat(saved.getRuleVersion()).isEqualTo(1);
+        assertThat(saved.getDefaultRule()).isTrue();
+        assertThat(saved.getLengthFactor()).isEqualByComparingTo("1.100000");
+        assertThat(saved.getWidthFactor()).isEqualByComparingTo("1.100000");
+        assertThat(saved.getHeightFactor()).isEqualByComparingTo("1.100000");
+        assertThat(saved.getConversionFactor()).isEqualByComparingTo("167.000000");
+        assertThat(saved.getRemark()).contains(
+            "SMALL:30,20,20；系数:1.1；重量:5",
+            "EXTRA_LARGE:60,50,50；系数:1.1；重量:15");
+        assertThat(saved.getInitializationKey()).isEqualTo("iam-customer-create:8");
+    }
+
+    @Test
+    void retryReturnsRuleOwnedBySameInitializationWithoutDuplicating() {
+        CustomerChargeRuleEntity existing = new CustomerChargeRuleEntity();
+        existing.setId(191L);
+        when(repository.findRuleByInitializationKey(8L, "iam-customer-create:8"))
+            .thenReturn(existing);
+
+        assertThat(service.initializeDefault(8L, 100L, "iam-customer-create:8", "柏悦物流"))
+            .isSameAs(existing);
+        verify(repository, never()).insertRule(any());
+    }
+
+    @Test
+    void compensationDeletesOnlyAnUnchangedInitializedRule() {
+        CustomerChargeRuleEntity value = service.initializeDefault(
+            8L, 100L, "iam-customer-create:8", "柏悦物流");
+        value.setVersion(0);
+        when(repository.findRuleByInitializationKeyForUpdate(8L, "iam-customer-create:8"))
+            .thenReturn(value);
+        when(repository.deleteUnchangedInitializedRule(8L, "iam-customer-create:8"))
+            .thenReturn(1);
+
+        CustomerChargeRuleEntity locked = service.lockForCompensation(8L, "iam-customer-create:8");
+        assertThat(service.isUnchangedDefault(locked)).isTrue();
+        service.deleteUnchangedDefault(8L, "iam-customer-create:8");
+
+        verify(repository).deleteUnchangedInitializedRule(8L, "iam-customer-create:8");
+    }
+}

firstleg/src/test/java/com/baiyue/firstleg/service/CustomerDimensionConfigServiceTest.java

@@ -22,6 +22,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -32,6 +33,8 @@ import static org.mockito.Mockito.when;
 class CustomerDimensionConfigServiceTest {
     @MockBean
     private CustomerDimensionConfigRepository repository;
+    @MockBean
+    private CustomerChargeRuleInitializationService chargeRuleInitialization;
     @Resource
     private CustomerDimensionConfigService service;
 
@@ -40,10 +43,12 @@ class CustomerDimensionConfigServiceTest {
         List<CustomerDimensionConfigEntity> persisted = defaultConfigs("registration-1");
         when(repository.findAll(8L)).thenReturn(List.of(), persisted);
         when(repository.insertDefaults(any(), eq(100L))).thenReturn(4);
+        when(chargeRuleInitialization.initializeDefault(8L, 100L, "registration-1", "柏悦物流"))
+            .thenReturn(defaultChargeRule());
 
-        InitializeResponse result = service.initializeDefault(8L, 100L, "registration-1");
+        InitializeResponse result = service.initializeDefault(8L, 100L, "registration-1", "柏悦物流");
 
-        assertThat(result).isEqualTo(new InitializeResponse(91L, true));
+        assertThat(result).isEqualTo(new InitializeResponse(91L, 191L, true));
         @SuppressWarnings("unchecked")
         ArgumentCaptor<List<CustomerDimensionConfigEntity>> captor = ArgumentCaptor.forClass(List.class);
         verify(repository).insertDefaults(captor.capture(), eq(100L));
@@ -67,10 +72,12 @@ class CustomerDimensionConfigServiceTest {
     @Test
     void retryAfterLostResponseKeepsCreationOwnershipForSameKey() {
         when(repository.findAll(8L)).thenReturn(defaultConfigs("registration-1"));
+        when(chargeRuleInitialization.initializeDefault(8L, 100L, "registration-1", "柏悦物流"))
+            .thenReturn(defaultChargeRule());
 
-        InitializeResponse result = service.initializeDefault(8L, 100L, "registration-1");
+        InitializeResponse result = service.initializeDefault(8L, 100L, "registration-1", "柏悦物流");
 
-        assertThat(result).isEqualTo(new InitializeResponse(91L, true));
+        assertThat(result).isEqualTo(new InitializeResponse(91L, 191L, true));
         verify(repository, never()).insertDefaults(any(), eq(100L));
     }
 
@@ -78,10 +85,11 @@ class CustomerDimensionConfigServiceTest {
     void differentInitializationKeyDoesNotTakeOwnershipOrOverwrite() {
         when(repository.findAll(8L)).thenReturn(defaultConfigs("registration-1"));
 
-        InitializeResponse result = service.initializeDefault(8L, 100L, "registration-2");
+        InitializeResponse result = service.initializeDefault(8L, 100L, "registration-2", "柏悦物流");
 
-        assertThat(result).isEqualTo(new InitializeResponse(91L, false));
+        assertThat(result).isEqualTo(new InitializeResponse(91L, null, false));
         verify(repository, never()).insertDefaults(any(), eq(100L));
+        verify(chargeRuleInitialization, never()).initializeDefault(anyLong(), anyLong(), any(), any());
     }
 
     @Test
@@ -173,10 +181,14 @@ class CustomerDimensionConfigServiceTest {
         when(repository.findDefaultsForCompensation(8L, "registration-1"))
             .thenReturn(defaultConfigs("registration-1"));
         when(repository.deleteUnchangedDefaults(8L, "registration-1")).thenReturn(4);
+        when(chargeRuleInitialization.lockForCompensation(8L, "registration-1"))
+            .thenReturn(defaultChargeRule());
+        when(chargeRuleInitialization.isUnchangedDefault(any())).thenReturn(true);
 
         service.compensateDefault(8L, "registration-1");
 
         verify(repository).deleteUnchangedDefaults(8L, "registration-1");
+        verify(chargeRuleInitialization).deleteUnchangedDefault(8L, "registration-1");
     }
 
     @Test
@@ -228,4 +240,11 @@ class CustomerDimensionConfigServiceTest {
         }
         return values;
     }
+
+    private static com.baiyue.firstleg.entity.CustomerChargeRuleEntity defaultChargeRule() {
+        com.baiyue.firstleg.entity.CustomerChargeRuleEntity value =
+            new com.baiyue.firstleg.entity.CustomerChargeRuleEntity();
+        value.setId(191L);
+        return value;
+    }
 }