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

firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java

@@ -613,12 +613,13 @@ public class FbaPricingService {
     }
 
     private static boolean preserveProcessStatusDuringPricing(String processStatus) {
-        return List.of("WAIT_PALLET", "WAIT_SPLIT", "LOADING").contains(processStatus);
+        return List.of("WAIT_PALLET", "WAIT_PALLETIZE", "WAIT_SPLIT", "LOADING").contains(processStatus);
     }
 
     private static boolean feeEditableBeforeLoading(String processStatus) {
         return List.of("WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED",
-            "WAIT_PRICING", "FEE_CONFIRMING", "WAIT_PALLET", "WAIT_SPLIT", "LOADING").contains(processStatus);
+            "WAIT_PRICING", "FEE_CONFIRMING", "WAIT_PALLET", "WAIT_PALLETIZE", "WAIT_SPLIT", "LOADING")
+            .contains(processStatus);
     }
 
     private static PricingDestinationType destinationType(InboundPricingEntity inbound) {

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

@@ -316,6 +316,24 @@ class FbaPricingServiceTest {
         verify(priceBookEstimator).estimate(eq(TENANT), any());
     }
 
+    @Test
+    @DisplayName("一件代发待合托状态允许初算且不改变作业状态")
+    void calculatesDropshipFeeWhileWaitingForPalletization() {
+        readyRepository();
+        InboundPricingEntity inbound = inbound("10", "1");
+        inbound.setProcessStatus("WAIT_PALLETIZE");
+        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
+        when(priceBookEstimator.estimate(anyLong(), any())).thenReturn(
+            estimate("CBM", "1.0000", "10", "10", "0"));
+
+        FeeSnapshotResponse response = service.calculate(
+            TENANT, OPERATOR, INBOUND, NOW, "dropship-initial-pricing");
+
+        assertThat(response.nextProcessStatus()).isEqualTo("WAIT_PALLETIZE");
+        verify(repository).markInboundCalculated(TENANT, INBOUND, "WAIT_PALLETIZE", "CBM",
+            new BigDecimal("1.0000"));
+    }
+
     @Test
     @DisplayName("客户未确认时待装柜订单可重新计算并替换已发送费用")
     void recalculatesSentFeeBeforeCustomerConfirmation() {