From de101621ddbfe1d2a15b0a4a67b83f626bc8acf3 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Sat, 29 Aug 2026 11:13:35 +0800 Subject: [PATCH] fix(firstleg): align merchant billing with sent fees --- .../MerchantInboundBillingController.java | 2 +- .../service/MerchantInboundBillingService.java | 2 +- .../src/main/resources/openapi/firstleg-v1.yaml | 2 +- ...hantInboundBillingControllerContractTest.java | 4 ++-- .../MerchantInboundBillingServiceTest.java | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/firstleg/src/main/java/com/baiyue/firstleg/controller/MerchantInboundBillingController.java b/firstleg/src/main/java/com/baiyue/firstleg/controller/MerchantInboundBillingController.java index ff6675307..bbb3636ef 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/controller/MerchantInboundBillingController.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/controller/MerchantInboundBillingController.java @@ -30,7 +30,7 @@ public class MerchantInboundBillingController { @PreAuthorize("hasAuthority('merchant:order:view')") @Operation(summary = "查询订单入库结果和最新费用", description = "客户按登录态客户范围只读查看；入库流程达到 WAIT_SPLIT 后，" - + "在 LOADING、LOADED、DELIVERED 仍持续可见，且始终要求 APPROVED + CONFIRMED " + + "在 LOADING、LOADED、DELIVERED 仍持续可见，且始终要求 APPROVED + SENT " + "并存在已发布入库运费明细，不需要客户确认费用。") public ApiResponse find( @AuthenticationPrincipal AuthenticatedUser user, @PathVariable long orderId) { diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/MerchantInboundBillingService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/MerchantInboundBillingService.java index eae943048..954e1d890 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/service/MerchantInboundBillingService.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/service/MerchantInboundBillingService.java @@ -126,7 +126,7 @@ public class MerchantInboundBillingService { private static boolean isPublished(InboundOrderEntity inbound) { return PUBLISHED_BILLING_PROCESS_STATUSES.contains(inbound.getProcessStatus()) && "APPROVED".equals(inbound.getMeasureReviewStatus()) - && "CONFIRMED".equals(inbound.getFeeStatus()); + && "SENT".equals(inbound.getFeeStatus()); } private String previewUrl(long orderId, long fileId) { diff --git a/firstleg/src/main/resources/openapi/firstleg-v1.yaml b/firstleg/src/main/resources/openapi/firstleg-v1.yaml index 506c12ebb..ac2851984 100644 --- a/firstleg/src/main/resources/openapi/firstleg-v1.yaml +++ b/firstleg/src/main/resources/openapi/firstleg-v1.yaml @@ -905,7 +905,7 @@ paths: /api/merchant/v1/first-leg/orders/{orderId}/inbound-billing: get: summary: 客户查询已完成入库结果和最新已发布费用 - description: 需要 merchant:order:view 权限；客户仅能按登录态客户范围只读查看。入库流程达到 WAIT_SPLIT 后，费用在 LOADING、LOADED、DELIVERED 仍持续可见；始终要求 measureReviewStatus=APPROVED、feeStatus=CONFIRMED 且存在 PUBLISHED 入库运费明细，不需要客户确认费用。 + description: 需要 merchant:order:view 权限；客户仅能按登录态客户范围只读查看。入库流程达到 WAIT_SPLIT 后，费用在 LOADING、LOADED、DELIVERED 仍持续可见；始终要求 measureReviewStatus=APPROVED、feeStatus=SENT 且存在 PUBLISHED 入库运费明细，不需要客户确认费用。CONFIRMED 只表示发送前确认完成，尚未生成可对客发布明细。 parameters: - {name: orderId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}} responses: diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/MerchantInboundBillingControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/MerchantInboundBillingControllerContractTest.java index d7b90579d..af2b23340 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/controller/MerchantInboundBillingControllerContractTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/MerchantInboundBillingControllerContractTest.java @@ -34,7 +34,7 @@ class MerchantInboundBillingControllerContractTest { assertThat(method.getAnnotation(PreAuthorize.class).value()) .isEqualTo("hasAuthority('merchant:order:view')"); assertThat(method.getAnnotation(Operation.class).description()) - .contains("WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED", "APPROVED + CONFIRMED", "已发布入库运费明细"); + .contains("WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED", "APPROVED + SENT", "已发布入库运费明细"); assertThat(MerchantInboundBillingController.class.getDeclaredMethods()) .noneMatch(candidate -> candidate.getName().toLowerCase().contains("confirm")); @@ -42,7 +42,7 @@ class MerchantInboundBillingControllerContractTest { .getContentAsString(StandardCharsets.UTF_8); assertThat(openapi).contains("/api/merchant/v1/first-leg/orders/{orderId}/inbound-billing:") .contains("WAIT_SPLIT", "LOADING、LOADED、DELIVERED", "measureReviewStatus=APPROVED", - "feeStatus=CONFIRMED", "PUBLISHED 入库运费明细"); + "feeStatus=SENT", "PUBLISHED 入库运费明细", "CONFIRMED 只表示发送前确认完成"); } @Test diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/MerchantInboundBillingServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/MerchantInboundBillingServiceTest.java index def56bac8..ca54a977d 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/service/MerchantInboundBillingServiceTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/service/MerchantInboundBillingServiceTest.java @@ -39,7 +39,7 @@ class MerchantInboundBillingServiceTest { @ParameterizedTest @ValueSource(strings = {"WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED"}) void shouldKeepPublishedBillingVisibleAfterFulfillmentProgresses(String processStatus) { - InboundOrderEntity inbound = inbound(processStatus, "APPROVED", "CONFIRMED"); + InboundOrderEntity inbound = inbound(processStatus, "APPROVED", "SENT"); InboundOrderDetail detail = new InboundOrderDetail(mock(com.baiyue.firstleg.dto.InboundOrderSummary.class), "客户备注", List.of(), List.of( new InboundOrderDetail.FileSummary(1L, "RELATED", "public.pdf", "PUBLIC", 1, 1L, null), @@ -86,7 +86,7 @@ class MerchantInboundBillingServiceTest { @Test void shouldHandleCase02() { - InboundOrderEntity inbound = inbound("WAIT_SPLIT", "PENDING", "CONFIRMED"); + InboundOrderEntity inbound = inbound("WAIT_SPLIT", "PENDING", "SENT"); when(orders.findByOrderId(10001L, 77L)).thenReturn(inbound); assertThatThrownBy(() -> service.find(10001L, 77L)) @@ -107,7 +107,7 @@ class MerchantInboundBillingServiceTest { @Test void shouldHandleCase04() { - InboundOrderEntity inbound = inbound("WAIT_SPLIT", "APPROVED", "CONFIRMED"); + InboundOrderEntity inbound = inbound("WAIT_SPLIT", "APPROVED", "SENT"); InboundMeasurementResponses.Detail measurement = mock(InboundMeasurementResponses.Detail.class); InboundMeasurementResponses.Item item = mock(InboundMeasurementResponses.Item.class); when(item.intelligentImageFileId()).thenReturn(41L); @@ -130,7 +130,7 @@ class MerchantInboundBillingServiceTest { @Test void shouldHandleCase05() { - InboundOrderEntity inbound = inbound("WAIT_SPLIT", "APPROVED", "CONFIRMED"); + InboundOrderEntity inbound = inbound("WAIT_SPLIT", "APPROVED", "SENT"); InboundMeasurementResponses.Detail measurement = mock(InboundMeasurementResponses.Detail.class); when(measurement.items()).thenReturn(List.of()); when(measurement.weightResults()).thenReturn(List.of()); @@ -144,8 +144,8 @@ class MerchantInboundBillingServiceTest { } @Test - void shouldRejectHistoricalPublishedStatusCombination() { - InboundOrderEntity inbound = inbound("WAIT_SPLIT", "APPROVED", "SENT"); + void shouldRejectConfirmedFeeBeforeItIsSentAndPublished() { + InboundOrderEntity inbound = inbound("WAIT_SPLIT", "APPROVED", "CONFIRMED"); when(orders.findByOrderId(10001L, 77L)).thenReturn(inbound); assertThatThrownBy(() -> service.find(10001L, 77L)) @@ -157,7 +157,7 @@ class MerchantInboundBillingServiceTest { @ParameterizedTest @ValueSource(strings = {"FEE_CONFIRMING", "VOIDED"}) void shouldRejectProcessStatusesOutsidePublishedFulfillmentLifecycle(String processStatus) { - InboundOrderEntity inbound = inbound(processStatus, "APPROVED", "CONFIRMED"); + InboundOrderEntity inbound = inbound(processStatus, "APPROVED", "SENT"); when(orders.findByOrderId(10001L, 77L)).thenReturn(inbound); assertThatThrownBy(() -> service.find(10001L, 77L)) @@ -168,7 +168,7 @@ class MerchantInboundBillingServiceTest { @Test void shouldRequirePublishedFreightDetailAfterLoadingCompletes() { - InboundOrderEntity inbound = inbound("LOADED", "APPROVED", "CONFIRMED"); + InboundOrderEntity inbound = inbound("LOADED", "APPROVED", "SENT"); when(orders.findByOrderId(10001L, 77L)).thenReturn(inbound); when(feeDetails.publishedFreight(10001L, 88L)) .thenThrow(new BizException(com.baiyue.common.core.api.ResultCode.NOT_FOUND,