feat: complete overseas customer and PDA workflows

2026-09-04 12:59:37 +08:00
parent a274d029bb
commit 54cb9ceade
60 changed files with 1598 additions and 277 deletions
@@ -0,0 +1,49 @@
+package com.baiyue.lastleg.inboundplan.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
+import com.baiyue.lastleg.inboundplan.service.InboundPlanService;
+import com.baiyue.lastleg.security.OverseasPermissions;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+@RestController
+@RequestMapping("/api/merchant/v1/last-leg/inbound-plans")
+@PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_INBOUND_LIST + "')")
+public class MerchantInboundPlanController {
+    @Resource private InboundPlanService service;
+
+    @GetMapping
+    public ApiResponse<PageResult<InboundPlanListResponse>> page(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid InboundPlanRequests.Query query) {
+        return ApiResponse.success(service.page(customer(user), query));
+    }
+
+    @GetMapping("/{planNo}")
+    public ApiResponse<InboundPlanResponse> detail(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String planNo) {
+        return ApiResponse.success(service.detailByPlanNo(customer(user), planNo));
+    }
+
+    private String customer(AuthenticatedUser user) {
+        if (user == null || user.tenantId() == null) {
+            throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        }
+        if ("PLATFORM".equals(user.appCode()) || user.tenantId() == 0L) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Merchant identity is required");
+        }
+        return String.valueOf(user.tenantId());
+    }
+}
@@ -0,0 +1,67 @@
+package com.baiyue.lastleg.looseboard.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.looseboard.dto.LocalLooseboardRequests;
+import com.baiyue.lastleg.looseboard.dto.LocalLooseboardResponses;
+import com.baiyue.lastleg.looseboard.service.LocalLooseboardService;
+import com.baiyue.lastleg.security.OverseasPermissions;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+@RestController
+@RequestMapping("/api/merchant/v1/last-leg/local-looseboard-orders")
+@PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_LOOSEBOARD + "')")
+public class MerchantLocalLooseboardController {
+    @Resource private LocalLooseboardService service;
+
+    @PostMapping
+    public ApiResponse<LocalLooseboardResponses.Detail> create(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody LocalLooseboardRequests.Create request) {
+        return ApiResponse.success(service.create(customer(user), operator(user), request));
+    }
+
+    @GetMapping
+    public ApiResponse<PageResult<LocalLooseboardResponses.Summary>> page(
+        @AuthenticationPrincipal AuthenticatedUser user, @Valid LocalLooseboardRequests.MerchantQuery query) {
+        return ApiResponse.success(service.page(customer(user), query));
+    }
+
+    @GetMapping("/{orderNo}")
+    public ApiResponse<LocalLooseboardResponses.Detail> detail(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String orderNo) {
+        return ApiResponse.success(service.detail(customer(user), orderNo));
+    }
+
+    @PutMapping("/{orderNo}")
+    public ApiResponse<LocalLooseboardResponses.Detail> update(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String orderNo, @Valid @RequestBody LocalLooseboardRequests.Update request) {
+        return ApiResponse.success(service.update(customer(user), orderNo, operator(user), request));
+    }
+
+    private String customer(AuthenticatedUser user) {
+        if (user == null || user.tenantId() == null) {
+            throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        }
+        if ("PLATFORM".equals(user.appCode()) || user.tenantId() == 0L) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Merchant identity is required");
+        }
+        return String.valueOf(user.tenantId());
+    }
+
+    private String operator(AuthenticatedUser user) {
+        return user.userId() == null ? user.username() : String.valueOf(user.userId());
+    }
+}
@@ -65,6 +65,16 @@ public final class LocalLooseboardRequests {
        LocalDate requestedFrom,
        LocalDate requestedTo) { }

+    public record MerchantQuery(
+        @Min(1) long page,
+        @Min(1) @Max(200) long size,
+        String orderNo,
+        String routeKeyword,
+        String status,
+        String transportMode,
+        LocalDate requestedFrom,
+        LocalDate requestedTo) { }
+
    public record ChangeStatus(
        @NotNull @Min(0) Long version,
        @NotBlank @Size(max = 32) String status,
@@ -118,6 +118,14 @@ public class LocalLooseboardService {
            result.getSize(), result.getTotal(), result.getPages());
    }

+    /** Customer-scoped query that ignores any client-supplied customer filter. */
+    public PageResult<LocalLooseboardResponses.Summary> page(String customerId,
+                                                              LocalLooseboardRequests.MerchantQuery query) {
+        return page(new LocalLooseboardRequests.Query(query.page(), query.size(), customerId,
+            query.orderNo(), query.routeKeyword(), query.status(), query.transportMode(),
+            query.requestedFrom(), query.requestedTo()));
+    }
+
    public LocalLooseboardResponses.Detail detail(String customerId, String orderNo) {
        LocalLooseboardOrder order = orders.findNo(customerId, orderNo);
        if (order == null) throw notFound();
@@ -6,9 +6,11 @@ import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.procurement.dto.OverseasProcurementRequests;
 import com.baiyue.lastleg.procurement.dto.OverseasProcurementResponses;
 import com.baiyue.lastleg.procurement.service.OverseasProcurementService;
+import com.baiyue.lastleg.security.OverseasPermissions;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,6 +22,7 @@ import org.springframework.web.server.ResponseStatusException;

@RestController
@RequestMapping("/api/merchant/v1/last-leg/overseas-procurements")
+@PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_PROCUREMENT + "')")
 public class MerchantOverseasProcurementController {
    @Resource private OverseasProcurementService service;

@@ -32,8 +35,8 @@ public class MerchantOverseasProcurementController {

    @GetMapping
    public ApiResponse<PageResult<OverseasProcurementResponses.Summary>> page(
-        @AuthenticationPrincipal AuthenticatedUser user, @Valid OverseasProcurementRequests.Query query) {
-        return ApiResponse.success(service.page(customer(user), query));
+        @AuthenticationPrincipal AuthenticatedUser user, @Valid OverseasProcurementRequests.MerchantQuery query) {
+        return ApiResponse.success(service.page(customer(user), query.scoped()));
    }

    @GetMapping("/{orderNo}")
@@ -36,6 +36,17 @@ public final class OverseasProcurementRequests {
        String productName, String status, String purchaseWarehouseId,
        LocalDateTime createdFrom, LocalDateTime createdTo) {}

+    public record MerchantQuery(
+        @Min(1) long page, @Min(1) @Max(200) long size,
+        String orderNo, String purchaseCategory, String productName,
+        String status, String purchaseWarehouseId,
+        LocalDateTime createdFrom, LocalDateTime createdTo) {
+        public Query scoped() {
+            return new Query(page, size, orderNo, null, purchaseCategory, productName,
+                status, purchaseWarehouseId, createdFrom, createdTo);
+        }
+    }
+
    public record Review(
        @NotNull @Min(0) Long version,
        @NotBlank String decision,
@@ -36,6 +36,10 @@ public final class OverseasPermissions {
    public static final String CUSTOMER_VISIT_EDIT = "platform:overseas-warehouse:customer-visit:edit";
    public static final String MERCHANT_DELIVERY_LIST = "merchant:warehouse:delivery:list";
    public static final String MERCHANT_DELIVERY_CREATE = "merchant:warehouse:delivery:create";
+    public static final String MERCHANT_INBOUND_LIST = "merchant:warehouse:inbound:list";
+    public static final String MERCHANT_PROCUREMENT = "merchant:cross-border:procurement";
+    public static final String MERCHANT_TRUCKING = "merchant:cross-border:domestic-trucking";
+    public static final String MERCHANT_LOOSEBOARD = "merchant:cross-border:pallet-shipping";
    public static final String PURCHASE_LIST = "platform:overseas-business:purchase:list";
    public static final String PURCHASE_EDIT = "platform:overseas-business:purchase:edit";
    public static final String PURCHASE_REVIEW = "platform:overseas-business:purchase:review";
@@ -6,9 +6,11 @@ import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderRequests;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderResponses;
 import com.baiyue.lastleg.trucking.service.UsTruckOrderService;
+import com.baiyue.lastleg.security.OverseasPermissions;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -21,6 +23,7 @@ import org.springframework.web.server.ResponseStatusException;

@RestController
@RequestMapping("/api/merchant/v1/last-leg/us-truck-orders")
+@PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_TRUCKING + "')")
 public class MerchantUsTruckOrderController {
    @Resource private UsTruckOrderService service;

@@ -32,8 +35,8 @@ public class MerchantUsTruckOrderController {

    @GetMapping
    public ApiResponse<PageResult<UsTruckOrderResponses.Summary>> page(@AuthenticationPrincipal AuthenticatedUser user,
-        @Valid UsTruckOrderRequests.Query query) {
-        return ApiResponse.success(service.page(customer(user), query));
+        @Valid UsTruckOrderRequests.MerchantQuery query) {
+        return ApiResponse.success(service.page(customer(user), query.scoped()));
    }

    @GetMapping("/{orderNo}")
@@ -53,6 +53,16 @@ public final class UsTruckOrderRequests {
        String orderNo, String routeKeyword, String status, String transportType,
        String customerId, LocalDate requestedFrom, LocalDate requestedTo) {}

+    public record MerchantQuery(
+        @Min(1) long page, @Min(1) @Max(200) long size,
+        String orderNo, String routeKeyword, String status, String transportType,
+        LocalDate requestedFrom, LocalDate requestedTo) {
+        public Query scoped() {
+            return new Query(page, size, orderNo, routeKeyword, status, transportType,
+                null, requestedFrom, requestedTo);
+        }
+    }
+
    public record Update(
        @NotNull @Min(0) Long version,
        @Size(max = 32) String transportType,