提交

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/controller/InventoryCommandController.java

@@ -33,7 +33,8 @@ public class InventoryCommandController {
     public ApiResponse<InventoryCommandResponse> hold(@AuthenticationPrincipal AuthenticatedUser user,
                                                        @Valid @RequestBody InventoryCommandRequests.Move request) {
         requirePermission(user, MANAGE_PERMISSION);
-        return ApiResponse.success(service.hold(scope(user, request.customerId()), operator(user), request));
+        requirePlatform(user);
+        return ApiResponse.success(service.holdPlatform(operator(user), request));
     }
 
     @PostMapping("/release")
@@ -42,7 +43,8 @@ public class InventoryCommandController {
     public ApiResponse<InventoryCommandResponse> release(@AuthenticationPrincipal AuthenticatedUser user,
                                                           @Valid @RequestBody InventoryCommandRequests.Move request) {
         requirePermission(user, MANAGE_PERMISSION);
-        return ApiResponse.success(service.release(scope(user, request.customerId()), operator(user), request));
+        requirePlatform(user);
+        return ApiResponse.success(service.releasePlatform(operator(user), request));
     }
 
     @PostMapping("/adjust")
@@ -51,19 +53,15 @@ public class InventoryCommandController {
     public ApiResponse<InventoryCommandResponse> adjust(@AuthenticationPrincipal AuthenticatedUser user,
                                                          @Valid @RequestBody InventoryCommandRequests.Adjustment request) {
         requirePermission(user, ADJUST_PERMISSION);
-        return ApiResponse.success(service.adjust(scope(user, request.customerId()), operator(user), request));
+        requirePlatform(user);
+        return ApiResponse.success(service.adjustPlatform(operator(user), request));
     }
 
-    private String scope(AuthenticatedUser user, String requestedCustomer) {
+    private void requirePlatform(AuthenticatedUser user) {
         if (user == null || user.tenantId() == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
-        if ("PLATFORM".equals(user.appCode()) && user.tenantId() == 0L) {
-            if (requestedCustomer == null || requestedCustomer.isBlank() || "0".equals(requestedCustomer)) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                    "Platform request must specify target tenant");
-            }
-            return requestedCustomer.trim();
+        if (!"PLATFORM".equals(user.appCode()) || user.tenantId() != 0L) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Platform application required");
         }
-        return String.valueOf(user.tenantId());
     }
 
     private String operator(AuthenticatedUser user) {

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/dto/InventoryCommandRequests.java

@@ -39,7 +39,6 @@ public final class InventoryCommandRequests {
     }
 
     public record Move(
-        String customerId,
         @NotNull Long positionId,
         @Positive long packages,
         String businessOrderNo,
@@ -51,7 +50,6 @@ public final class InventoryCommandRequests {
     }
 
     public record Adjustment(
-        String customerId,
         @NotNull Long positionId,
         long packageDelta,
         @NotBlank String reason,

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/mapper/InventoryCommandMapper.java

@@ -8,6 +8,9 @@ import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface InventoryCommandMapper {
+    @Select("SELECT * FROM ll_inventory_position WHERE id=#{positionId} LIMIT 1")
+    InventoryPosition findPosition(@Param("positionId") Long positionId);
+
     @Select("SELECT * FROM ll_inventory_position WHERE customer_id=#{customerId} AND id=#{positionId} LIMIT 1 FOR UPDATE")
     InventoryPosition lockPosition(@Param("customerId") String customerId,
                                    @Param("positionId") Long positionId);

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/service/InventoryCommandService.java

@@ -67,11 +67,21 @@ public class InventoryCommandService {
         return move(customerId, operatorId, "HOLD", Bucket.AVAILABLE, Bucket.HOLD, request);
     }
 
+    @Transactional
+    public InventoryCommandResponse holdPlatform(String operatorId, InventoryCommandRequests.Move request) {
+        return move(customerForPosition(request.positionId()), operatorId, "HOLD", Bucket.AVAILABLE, Bucket.HOLD, request);
+    }
+
     @Transactional
     public InventoryCommandResponse release(String customerId, String operatorId, InventoryCommandRequests.Move request) {
         return move(customerId, operatorId, "RELEASE", Bucket.HOLD, Bucket.AVAILABLE, request);
     }
 
+    @Transactional
+    public InventoryCommandResponse releasePlatform(String operatorId, InventoryCommandRequests.Move request) {
+        return move(customerForPosition(request.positionId()), operatorId, "RELEASE", Bucket.HOLD, Bucket.AVAILABLE, request);
+    }
+
     @Transactional
     public InventoryCommandResponse allocate(String customerId, String operatorId, InventoryCommandRequests.Move request) {
         return move(customerId, operatorId, "ALLOCATE", Bucket.AVAILABLE, Bucket.ALLOCATED, request);
@@ -147,6 +157,11 @@ public class InventoryCommandService {
         });
     }
 
+    @Transactional
+    public InventoryCommandResponse adjustPlatform(String operatorId, InventoryCommandRequests.Adjustment request) {
+        return adjust(customerForPosition(request.positionId()), operatorId, request);
+    }
+
     private InventoryCommandResponse move(String customerId, String operatorId, String operationType,
                                           Bucket from, Bucket to, InventoryCommandRequests.Move request) {
         return execute(customerId, operatorId, operationType, request.idempotencyKey(), request, operation -> {
@@ -255,6 +270,12 @@ public class InventoryCommandService {
         return new Locked(balance, position);
     }
 
+    private String customerForPosition(Long positionId) {
+        InventoryPosition position = commands.findPosition(positionId);
+        if (position == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inventory position not found");
+        return position.getCustomerId();
+    }
+
     private InventoryCommandResponse execute(String customerId, String operatorId, String operationType,
                                              String key, Object request, Work work) {
         String normalizedKey = required(key, "Idempotency key is required");

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/controller/InventoryQueryController.java

@@ -22,7 +22,6 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -41,9 +40,9 @@ public class InventoryQueryController {
     @Operation(summary = "Get inbound-order package inventory totals", description = "Required authority: " + OverseasPermissions.INVENTORY_LIST)
     public ApiResponse<InventoryDashboardResponse> summary(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
         @Valid InventoryQueryRequests.BalanceQuery query) {
-        return ApiResponse.success(service.dashboard(scope(user, customerId), query));
+        requirePlatform(user);
+        return ApiResponse.success(service.dashboard(null, query));
     }
 
     @GetMapping(BASE_PATH + "/balances")
@@ -51,9 +50,9 @@ public class InventoryQueryController {
     @Operation(summary = "Page inventory by customer, warehouse and inbound order", description = "Required authority: " + OverseasPermissions.INVENTORY_LIST)
     public ApiResponse<PageResult<InventoryBalanceView>> balances(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
         @Valid InventoryQueryRequests.BalanceQuery query) {
-        return ApiResponse.success(service.balances(scope(user, customerId), query));
+        requirePlatform(user);
+        return ApiResponse.success(service.balances(null, query));
     }
 
     @GetMapping(BASE_PATH + "/balances/{balanceId}/positions")
@@ -61,10 +60,10 @@ public class InventoryQueryController {
     @Operation(summary = "List pallet and batch positions for one inbound-order balance", description = "Required authority: " + OverseasPermissions.INVENTORY_LIST)
     public ApiResponse<List<InventoryPositionView>> positions(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
         @PathVariable long balanceId,
         @Valid InventoryQueryRequests.PositionQuery query) {
-        return ApiResponse.success(service.positions(scope(user, customerId), balanceId, query));
+        requirePlatform(user);
+        return ApiResponse.success(service.positions(null, balanceId, query));
     }
 
     @GetMapping(BASE_PATH + "/ledger")
@@ -72,9 +71,9 @@ public class InventoryQueryController {
     @Operation(summary = "Page append-only inventory movements", description = "Required authority: " + OverseasPermissions.INVENTORY_LIST)
     public ApiResponse<PageResult<InventoryLedgerView>> ledgers(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
         @Valid InventoryQueryRequests.LedgerQuery query) {
-        return ApiResponse.success(service.ledgers(scope(user, customerId), query));
+        requirePlatform(user);
+        return ApiResponse.success(service.ledgers(null, query));
     }
 
     @GetMapping(value = BASE_PATH + "/balances/export", produces = "text/csv")
@@ -82,9 +81,9 @@ public class InventoryQueryController {
     @Operation(summary = "Export filtered inbound-order inventory as UTF-8 CSV", description = "Required authority: " + OverseasPermissions.INVENTORY_EXPORT)
     public ResponseEntity<byte[]> exportBalances(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
         @Valid InventoryQueryRequests.BalanceQuery query) {
-        return csv(service.exportBalances(scope(user, customerId), query), "inventory-balances.csv");
+        requirePlatform(user);
+        return csv(service.exportBalances(null, query), "inventory-balances.csv");
     }
 
     @GetMapping(value = BASE_PATH + "/ledger/export", produces = "text/csv")
@@ -92,9 +91,9 @@ public class InventoryQueryController {
     @Operation(summary = "Export filtered inventory movements as UTF-8 CSV", description = "Required authority: " + OverseasPermissions.INVENTORY_EXPORT)
     public ResponseEntity<byte[]> exportLedgers(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
         @Valid InventoryQueryRequests.LedgerQuery query) {
-        return csv(service.exportLedgers(scope(user, customerId), query), "inventory-ledger.csv");
+        requirePlatform(user);
+        return csv(service.exportLedgers(null, query), "inventory-ledger.csv");
     }
 
     private static ResponseEntity<byte[]> csv(byte[] body, String filename) {
@@ -104,17 +103,12 @@ public class InventoryQueryController {
             .body(body);
     }
 
-    private String scope(AuthenticatedUser user, String requestedCustomer) {
+    private void requirePlatform(AuthenticatedUser user) {
         if (user == null || user.tenantId() == null) {
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
         }
-        if ("PLATFORM".equals(user.appCode()) && user.tenantId() == 0L) {
-            if (requestedCustomer == null || requestedCustomer.isBlank() || "0".equals(requestedCustomer)) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                    "Platform queries must specify a customer");
-            }
-            return requestedCustomer;
+        if (!"PLATFORM".equals(user.appCode()) || user.tenantId() != 0L) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Platform application required");
         }
-        return String.valueOf(user.tenantId());
     }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/mapper/InventoryQueryMapper.java

@@ -11,18 +11,19 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 
 public interface InventoryQueryMapper {
-    String BALANCE_FILTER = " WHERE customer_id=#{customerId}" +
+    String BALANCE_FILTER = " WHERE 1=1" +
+        "<if test='customerId != null and customerId != \"\"'> AND customer_id=#{customerId}</if>" +
         "<if test='q.customerName != null and q.customerName != \"\"'> AND customer_name LIKE CONCAT('%',#{q.customerName},'%')</if>" +
         "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND overseas_warehouse_id=#{q.overseasWarehouseId}</if>" +
         "<if test='q.overseasWarehouseCode != null and q.overseasWarehouseCode != \"\"'> AND overseas_warehouse_code=#{q.overseasWarehouseCode}</if>" +
         "<if test='q.destinationWarehouseCode != null and q.destinationWarehouseCode != \"\"'> AND destination_warehouse_code=#{q.destinationWarehouseCode}</if>" +
         "<if test='q.inboundOrderNo != null and q.inboundOrderNo != \"\"'> AND inbound_order_no LIKE CONCAT('%',#{q.inboundOrderNo},'%')</if>" +
         "<if test='q.inboundCode != null and q.inboundCode != \"\"'> AND inbound_code LIKE CONCAT('%',#{q.inboundCode},'%')</if>" +
-        "<if test='q.businessOrderNo != null and q.businessOrderNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_ledger l WHERE l.balance_id=ll_inventory_balance.id AND l.customer_id=#{customerId} AND l.business_order_no LIKE CONCAT('%',#{q.businessOrderNo},'%'))</if>" +
+        "<if test='q.businessOrderNo != null and q.businessOrderNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_ledger l WHERE l.balance_id=ll_inventory_balance.id AND l.customer_id=ll_inventory_balance.customer_id AND l.business_order_no LIKE CONCAT('%',#{q.businessOrderNo},'%'))</if>" +
         "<if test='q.skuCode != null and q.skuCode != \"\"'> AND sku_code LIKE CONCAT('%',#{q.skuCode},'%')</if>" +
         "<if test='q.productName != null and q.productName != \"\"'> AND (product_name_zh LIKE CONCAT('%',#{q.productName},'%') OR product_name_en LIKE CONCAT('%',#{q.productName},'%'))</if>" +
-        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p WHERE p.balance_id=ll_inventory_balance.id AND p.customer_id=#{customerId} AND p.batch_no LIKE CONCAT('%',#{q.batchNo},'%'))</if>" +
-        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p WHERE p.balance_id=ll_inventory_balance.id AND p.customer_id=#{customerId} AND p.warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%'))</if>" +
+        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p WHERE p.balance_id=ll_inventory_balance.id AND p.customer_id=ll_inventory_balance.customer_id AND p.batch_no LIKE CONCAT('%',#{q.batchNo},'%'))</if>" +
+        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p WHERE p.balance_id=ll_inventory_balance.id AND p.customer_id=ll_inventory_balance.customer_id AND p.warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%'))</if>" +
         "<choose>" +
         "<when test='q.inventoryStatus == \"AVAILABLE\"'> AND available_packages &gt; 0</when>" +
         "<when test='q.inventoryStatus == \"HOLD\"'> AND hold_packages &gt; 0</when>" +
@@ -33,18 +34,19 @@ public interface InventoryQueryMapper {
         "<when test='q.inventoryStatus == \"PROCUREMENT\"'> AND procurement_packages &gt; 0</when>" +
         "</choose>";
 
-    String JOINED_BALANCE_FILTER = " WHERE b.customer_id=#{customerId}" +
+    String JOINED_BALANCE_FILTER = " WHERE 1=1" +
+        "<if test='customerId != null and customerId != \"\"'> AND b.customer_id=#{customerId}</if>" +
         "<if test='q.customerName != null and q.customerName != \"\"'> AND b.customer_name LIKE CONCAT('%',#{q.customerName},'%')</if>" +
         "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND b.overseas_warehouse_id=#{q.overseasWarehouseId}</if>" +
         "<if test='q.overseasWarehouseCode != null and q.overseasWarehouseCode != \"\"'> AND b.overseas_warehouse_code=#{q.overseasWarehouseCode}</if>" +
         "<if test='q.destinationWarehouseCode != null and q.destinationWarehouseCode != \"\"'> AND b.destination_warehouse_code=#{q.destinationWarehouseCode}</if>" +
         "<if test='q.inboundOrderNo != null and q.inboundOrderNo != \"\"'> AND b.inbound_order_no LIKE CONCAT('%',#{q.inboundOrderNo},'%')</if>" +
         "<if test='q.inboundCode != null and q.inboundCode != \"\"'> AND b.inbound_code LIKE CONCAT('%',#{q.inboundCode},'%')</if>" +
-        "<if test='q.businessOrderNo != null and q.businessOrderNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_ledger l WHERE l.balance_id=b.id AND l.customer_id=#{customerId} AND l.business_order_no LIKE CONCAT('%',#{q.businessOrderNo},'%'))</if>" +
+        "<if test='q.businessOrderNo != null and q.businessOrderNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_ledger l WHERE l.balance_id=b.id AND l.customer_id=b.customer_id AND l.business_order_no LIKE CONCAT('%',#{q.businessOrderNo},'%'))</if>" +
         "<if test='q.skuCode != null and q.skuCode != \"\"'> AND b.sku_code LIKE CONCAT('%',#{q.skuCode},'%')</if>" +
         "<if test='q.productName != null and q.productName != \"\"'> AND (b.product_name_zh LIKE CONCAT('%',#{q.productName},'%') OR b.product_name_en LIKE CONCAT('%',#{q.productName},'%'))</if>" +
-        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p2 WHERE p2.balance_id=b.id AND p2.customer_id=#{customerId} AND p2.batch_no LIKE CONCAT('%',#{q.batchNo},'%'))</if>" +
-        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p2 WHERE p2.balance_id=b.id AND p2.customer_id=#{customerId} AND p2.warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%'))</if>" +
+        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p2 WHERE p2.balance_id=b.id AND p2.customer_id=b.customer_id AND p2.batch_no LIKE CONCAT('%',#{q.batchNo},'%'))</if>" +
+        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p2 WHERE p2.balance_id=b.id AND p2.customer_id=b.customer_id AND p2.warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%'))</if>" +
         "<choose>" +
         "<when test='q.inventoryStatus == \"AVAILABLE\"'> AND b.available_packages &gt; 0</when>" +
         "<when test='q.inventoryStatus == \"HOLD\"'> AND b.hold_packages &gt; 0</when>" +
@@ -103,7 +105,11 @@ public interface InventoryQueryMapper {
     @Select("SELECT * FROM ll_inventory_balance WHERE customer_id=#{customerId} AND id=#{balanceId} LIMIT 1")
     InventoryBalance ownedBalance(@Param("customerId") String customerId, @Param("balanceId") long balanceId);
 
-    String LEDGER_FILTER = " WHERE customer_id=#{customerId}" +
+    @Select("SELECT * FROM ll_inventory_balance WHERE id=#{balanceId} LIMIT 1")
+    InventoryBalance findBalance(@Param("balanceId") long balanceId);
+
+    String LEDGER_FILTER = " WHERE 1=1" +
+        "<if test='customerId != null and customerId != \"\"'> AND customer_id=#{customerId}</if>" +
         "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND overseas_warehouse_id=#{q.overseasWarehouseId}</if>" +
         "<if test='q.destinationWarehouseCode != null and q.destinationWarehouseCode != \"\"'> AND destination_warehouse_code=#{q.destinationWarehouseCode}</if>" +
         "<if test='q.businessType != null and q.businessType != \"\"'> AND business_type=#{q.businessType}</if>" +

lastleg-service/src/main/java/com/baiyue/lastleg/inventory/query/service/InventoryQueryService.java

@@ -59,11 +59,15 @@ public class InventoryQueryService {
     public List<InventoryPositionView> positions(String customerId, long balanceId,
                                                  InventoryQueryRequests.PositionQuery query) {
         validateStatus(query.inventoryStatus(), POSITION_STATUSES);
-        InventoryBalance balance = mapper.ownedBalance(customerId, balanceId);
+        InventoryBalance balance = customerId == null
+            ? mapper.findBalance(balanceId)
+            : mapper.ownedBalance(customerId, balanceId);
         if (balance == null) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inventory balance not found");
         }
-        return mapper.positions(customerId, balanceId, query).stream().map(value -> positionView(value, balance)).toList();
+        String recordCustomerId = customerId == null ? balance.getCustomerId() : customerId;
+        return mapper.positions(recordCustomerId, balanceId, query).stream()
+            .map(value -> positionView(value, balance)).toList();
     }
 
     public PageResult<InventoryLedgerView> ledgers(String customerId, InventoryQueryRequests.LedgerQuery query) {