Merge remote-tracking branch 'origin/test' into test

firstleg/src/test/java/com/baiyue/firstleg/loading/service/LoadingDeliveryServiceTest.java

@@ -6,6 +6,7 @@ import com.baiyue.firstleg.loading.repository.LoadingRepository;
 import com.baiyue.firstleg.mapper.InboundStatusHistoryMapper;
 import com.baiyue.firstleg.mapper.LoadingPickItemMapper.InboundProgress;
 import com.baiyue.firstleg.repository.LoadingPickRepository;
+import com.baiyue.firstleg.service.FbaPricingService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
@@ -27,6 +28,7 @@ class LoadingDeliveryServiceTest {
     @MockBean LoadingCompletionGateService completionGate;
     @MockBean InboundStatusHistoryMapper histories;
     @MockBean CabinetLoadingEvidenceService cabinetEvidence;
+    @MockBean FbaPricingService pricingService;
     @MockBean ObjectMapper objectMapper;
     @Resource LoadingDeliveryService service;
 
@@ -46,6 +48,7 @@ class LoadingDeliveryServiceTest {
             new com.baiyue.firstleg.loading.dto.LoadingRequests.CompleteLoadingRequest(3, "done"));
 
         verify(cabinetEvidence).requireComplete(99L);
+        verify(pricingService).autoConfirmAfterLoading(10L, 20L);
     }
 
     @Test
@@ -86,6 +89,7 @@ class LoadingDeliveryServiceTest {
 
         verify(repository).findInboundForUpdate(10L, 21L);
         verify(repository).completeLoadedChild(10L, 20L, 9L, 9);
+        verify(pricingService).autoConfirmAfterLoading(10L, 21L);
     }
 
     @Test

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

@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.never;
@@ -69,6 +70,48 @@ class FbaPricingServiceTest {
         verify(repository, never()).findLatestFee(TENANT, INBOUND);
     }
 
+    @Test
+    @DisplayName("装柜完成后系统自动确认客户未确认的已发送费用")
+    void automaticallyConfirmsSentFeeAfterLoading() {
+        InboundFeeEntity sent = savedFee("SENT");
+        when(repository.findLatestFeeForUpdate(TENANT, INBOUND)).thenReturn(sent);
+        when(repository.confirmFeeByCustomer(TENANT, 501L, 1, 0L,
+            "装柜完成自动确认", NOW)).thenReturn(1);
+
+        service.autoConfirmAfterLoading(TENANT, INBOUND);
+
+        verify(repository).confirmFeeByCustomer(TENANT, 501L, 1, 0L,
+            "装柜完成自动确认", NOW);
+    }
+
+    @Test
+    @DisplayName("客户已经确认时装柜完成不覆盖原确认信息")
+    void keepsExistingCustomerConfirmationAfterLoading() {
+        InboundFeeEntity sent = savedFee("SENT");
+        sent.setCustomerConfirmedBy(88L);
+        sent.setCustomerConfirmedByName("客户成员");
+        sent.setCustomerConfirmedAt(NOW.minusHours(1));
+        when(repository.findLatestFeeForUpdate(TENANT, INBOUND)).thenReturn(sent);
+
+        service.autoConfirmAfterLoading(TENANT, INBOUND);
+
+        verify(repository, never()).confirmFeeByCustomer(anyLong(), anyLong(), anyInt(),
+            anyLong(), anyString(), any());
+    }
+
+    @Test
+    @DisplayName("没有已发送费用时装柜完成不受影响")
+    void ignoresMissingOrUnsentFeeAfterLoading() {
+        when(repository.findLatestFeeForUpdate(TENANT, INBOUND))
+            .thenReturn(null, savedFee("CONFIRMED"));
+
+        service.autoConfirmAfterLoading(TENANT, INBOUND);
+        service.autoConfirmAfterLoading(TENANT, INBOUND);
+
+        verify(repository, never()).confirmFeeByCustomer(anyLong(), anyLong(), anyInt(),
+            anyLong(), anyString(), any());
+    }
+
     @Test
     @DisplayName("包税KG按生效价格表计费且不依赖客户规则或承运商")
     void calculatesTaxIncludedKgWithoutCustomerRuleOrCarrier() {