提交

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/controller/MerchantDeliveryController.java

@@ -0,0 +1,47 @@
+package com.baiyue.lastleg.delivery.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.delivery.dto.DeliveryRequests;
+import com.baiyue.lastleg.delivery.dto.DeliveryResponses;
+import com.baiyue.lastleg.delivery.service.DeliveryTransferService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+@RestController
+@RequestMapping("/api/merchant/v1/last-leg/delivery-orders")
+public class MerchantDeliveryController {
+    @Resource private DeliveryTransferService service;
+
+    @GetMapping
+    public ApiResponse<PageResult<DeliveryResponses.DeliveryRow>> page(@AuthenticationPrincipal AuthenticatedUser user,
+                                                                        @Valid DeliveryRequests.Query query) {
+        return ApiResponse.success(service.deliveryPage(customer(user), query));
+    }
+
+    @PostMapping
+    public ApiResponse<DeliveryResponses.TransferResult> create(@AuthenticationPrincipal AuthenticatedUser user,
+                                                                 @RequestParam String dispatchNo,
+                                                                 @Valid @RequestBody DeliveryRequests.Transfer request) {
+        return ApiResponse.success(service.transfer(customer(user), dispatchNo, operator(user), request));
+    }
+
+    @GetMapping("/{deliveryNo}")
+    public ApiResponse<DeliveryResponses.DeliveryDetail> detail(@AuthenticationPrincipal AuthenticatedUser user,
+                                                                 @PathVariable String deliveryNo,
+                                                                 @Valid DeliveryRequests.PalletQuery query) {
+        return ApiResponse.success(service.deliveryDetail(customer(user), deliveryNo, query));
+    }
+
+    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()); }
+}

lastleg-service/src/test/java/com/baiyue/lastleg/procurement/OverseasProcurementSchemaContractTest.java

@@ -20,6 +20,7 @@ class OverseasProcurementSchemaContractTest {
         assertTrue(sql.contains("operation_type VARCHAR(32) NOT NULL"));
         assertTrue(sql.contains("review_idempotency_key VARCHAR(255) NULL"));
         assertTrue(sql.contains("review_request_hash CHAR(64) NULL"));
+        assertTrue(sql.contains("outbound_details JSON NULL COMMENT '出库明细'"));
         assertTrue(sql.contains("idempotency_key VARCHAR(255) NULL COMMENT '操作幂等键'"));
         assertTrue(sql.contains("change_detail JSON NULL"));
         org.junit.jupiter.api.Assertions.assertFalse(sql.contains("CREATE TABLE IF NOT EXISTS ll_overseas_procurement_outbound"));
@@ -39,6 +40,8 @@ class OverseasProcurementSchemaContractTest {
             "ALTER TABLE ll_overseas_procurement_order ADD COLUMN review_idempotency_key VARCHAR(255) NULL"));
         assertTrue(sql.contains(
             "ALTER TABLE ll_overseas_procurement_order ADD COLUMN review_request_hash CHAR(64) NULL"));
+        assertTrue(sql.contains(
+            "ALTER TABLE ll_overseas_procurement_order ADD COLUMN outbound_details JSON NULL"));
         assertTrue(sql.contains(
             "table_name='ll_overseas_procurement_status_history' AND column_name='idempotency_key'"));
     }