fix(firstleg): align merchant billing with sent fees
This commit is contained in:
+1
-1
@@ -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<MerchantInboundBillingResponse> find(
|
||||
@AuthenticationPrincipal AuthenticatedUser user, @PathVariable long orderId) {
|
||||
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user