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

2026-09-09 03:40:54 +08:00
parent a99a54493b 68a5612598
commit bfcec93017
2 changed files with 21 additions and 1 deletions
@@ -204,6 +204,26 @@ class FbaPricingRepositoryRuleListTest {
            .contains("List.of(\"FEE_CONFIRMING\", \"WAIT_PALLET\", \"WAIT_SPLIT\", \"LOADING\", \"LOADED\", \"DELIVERED\")");
    }

+    @Test
+    void dropshipInitialPricingPreservesWaitingForPalletization() {
+        when(pricing.update(org.mockito.ArgumentMatchers.isNull(), org.mockito.ArgumentMatchers.any()))
+            .thenReturn(1);
+
+        assertThat(repository.markInboundCalculated(
+            10001L, 88L, "WAIT_PALLETIZE", "CBM", new java.math.BigDecimal("1.0000")))
+            .isEqualTo(1);
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<LambdaUpdateWrapper<InboundPricingEntity>> wrapper =
+            ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
+        verify(pricing).update(org.mockito.ArgumentMatchers.isNull(), wrapper.capture());
+        assertThat(wrapper.getValue().getSqlSet()).contains("feeStatus", "chargeableVolumeCbm")
+            .doesNotContain("processStatus");
+        assertThat(wrapper.getValue().getCustomSqlSegment())
+            .contains("tenantId", "id", "processStatus", "feeStatus");
+        assertThat(params(wrapper.getValue()).values()).contains(10001L, 88L, "WAIT_PALLETIZE");
+    }
+
    private Collection<Object> queryValues(Long tenantId, String ruleCode) {
        when(rules.selectList(org.mockito.ArgumentMatchers.any())).thenReturn(List.of());