提交

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/controller/RelabelApplicationController.java

@@ -25,40 +25,40 @@ public class RelabelApplicationController {
     @PreAuthorize("hasAuthority('" + OverseasPermissions.RELABEL_ORDER_CREATE + "')")
     @Operation(summary = "Create a relabel application", description = "Required authority: " + OverseasPermissions.RELABEL_ORDER_CREATE)
     public ApiResponse<RelabelResponses.Detail> create(@AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId, @Valid @RequestBody RelabelRequests.Create request) {
-        return ApiResponse.success(service.create(scope(user, customerId), operator(user), request));
+        @Valid @RequestBody RelabelRequests.Create request) {
+        requirePlatform(user);
+        return ApiResponse.success(service.create("0", operator(user), request));
     }
     @GetMapping
     @PreAuthorize("hasAuthority('" + OverseasPermissions.RELABEL_ORDER_LIST + "')")
     @Operation(summary = "Page relabel applications", description = "Required authority: " + OverseasPermissions.RELABEL_ORDER_LIST)
     public ApiResponse<PageResult<RelabelResponses.Summary>> page(@AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId, @Valid RelabelRequests.Query query) {
-        return ApiResponse.success(service.page(scope(user, customerId), query));
+        @Valid RelabelRequests.Query query) {
+        requirePlatform(user);
+        return ApiResponse.success(service.page(null, query));
     }
     @GetMapping("/{relabelNo}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.RELABEL_ORDER_LIST + "')")
     @Operation(summary = "Get a relabel application", description = "Required authority: " + OverseasPermissions.RELABEL_ORDER_LIST)
     public ApiResponse<RelabelResponses.Detail> detail(@AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId, @PathVariable String relabelNo) {
-        return ApiResponse.success(service.detail(scope(user, customerId), relabelNo));
+        @PathVariable String relabelNo) {
+        requirePlatform(user);
+        return ApiResponse.success(service.detail(null, relabelNo));
     }
     @PutMapping("/{relabelNo}/status")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.RELABEL_ORDER_STATUS + "')")
     @Operation(summary = "Change relabel application status", description = "Required authority: " + OverseasPermissions.RELABEL_ORDER_STATUS)
     public ApiResponse<RelabelResponses.Detail> status(@AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId, @PathVariable String relabelNo,
+        @PathVariable String relabelNo,
         @Valid @RequestBody RelabelRequests.ChangeStatus request) {
-        return ApiResponse.success(service.changeStatus(scope(user, customerId), relabelNo, operator(user), request));
+        requirePlatform(user);
+        return ApiResponse.success(service.changeStatus(null, relabelNo, operator(user), request));
     }
-    private String scope(AuthenticatedUser user, String requested) {
+    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 (requested == null || requested.isBlank() || "0".equals(requested)) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Platform request must specify target tenant");
-            }
-            return requested.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) { return user.userId() == null ? user.username() : String.valueOf(user.userId()); }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/mapper/RelabelApplicationMapper.java

@@ -11,9 +11,15 @@ public interface RelabelApplicationMapper extends BaseMapper<RelabelApplication>
     @Select("SELECT * FROM ll_relabel_application WHERE customer_id=#{customerId} AND relabel_no=#{relabelNo} LIMIT 1")
     RelabelApplication findNo(@Param("customerId") String customerId, @Param("relabelNo") String relabelNo);
 
+    @Select("SELECT * FROM ll_relabel_application WHERE relabel_no=#{relabelNo} LIMIT 1")
+    RelabelApplication findAnyByRelabelNo(@Param("relabelNo") String relabelNo);
+
     @Select("SELECT * FROM ll_relabel_application WHERE customer_id=#{customerId} AND idempotency_key=#{key} LIMIT 1")
     RelabelApplication findKey(@Param("customerId") String customerId, @Param("key") String key);
 
     @Select("SELECT * FROM ll_relabel_application WHERE customer_id=#{customerId} AND relabel_no=#{relabelNo} LIMIT 1 FOR UPDATE")
     RelabelApplication lockNo(@Param("customerId") String customerId, @Param("relabelNo") String relabelNo);
+
+    @Select("SELECT * FROM ll_relabel_application WHERE relabel_no=#{relabelNo} LIMIT 1 FOR UPDATE")
+    RelabelApplication lockAnyByRelabelNo(@Param("relabelNo") String relabelNo);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java

@@ -128,7 +128,7 @@ public class RelabelApplicationService {
             throw badRequest("createdFrom must not be after createdTo");
         }
         LambdaQueryWrapper<RelabelApplication> wrapper = new LambdaQueryWrapper<RelabelApplication>()
-            .eq(RelabelApplication::getCustomerId, customerId)
+            .eq(StringUtils.hasText(customerId), RelabelApplication::getCustomerId, customerId)
             .like(StringUtils.hasText(query.relabelNo()), RelabelApplication::getRelabelNo, query.relabelNo())
             .like(StringUtils.hasText(query.customerOrderNo()), RelabelApplication::getCustomerOrderNo, query.customerOrderNo())
             .eq(StringUtils.hasText(query.status()), RelabelApplication::getStatus, query.status())
@@ -147,9 +147,10 @@ public class RelabelApplicationService {
     @Transactional(readOnly = true)
     public RelabelResponses.Detail detail(String customerId, String relabelNo) {
         RelabelApplication application = require(customerId, relabelNo);
+        String recordCustomerId = application.getCustomerId();
         List<RelabelItem> detailItems = itemList(application.getId());
         List<RelabelStatusHistory> statusHistory = histories.selectList(new LambdaQueryWrapper<RelabelStatusHistory>()
-            .eq(RelabelStatusHistory::getCustomerId, customerId)
+            .eq(RelabelStatusHistory::getCustomerId, recordCustomerId)
             .eq(RelabelStatusHistory::getApplicationId, application.getId())
             .orderByAsc(RelabelStatusHistory::getCreatedAt));
         return new RelabelResponses.Detail(summary(application, detailItems), application.getRemark(),
@@ -161,8 +162,11 @@ public class RelabelApplicationService {
     @Transactional
     public RelabelResponses.Detail changeStatus(String customerId, String relabelNo, String operatorId,
                                                  RelabelRequests.ChangeStatus request) {
-        RelabelApplication application = applications.lockNo(customerId, relabelNo);
+        RelabelApplication application = StringUtils.hasText(customerId)
+            ? applications.lockNo(customerId, relabelNo)
+            : applications.lockAnyByRelabelNo(relabelNo);
         if (application == null) throw notFound("Relabel application not found");
+        customerId = application.getCustomerId();
         String next = request.status().trim().toUpperCase();
         if (!STATUSES.contains(next)) throw badRequest("Unsupported relabel status");
         if (next.equals(application.getStatus())) return detail(customerId, relabelNo);
@@ -232,7 +236,9 @@ public class RelabelApplicationService {
             .orderByAsc(RelabelItem::getId));
     }
     private RelabelApplication require(String customerId, String relabelNo) {
-        RelabelApplication value = applications.findNo(customerId, relabelNo);
+        RelabelApplication value = StringUtils.hasText(customerId)
+            ? applications.findNo(customerId, relabelNo)
+            : applications.findAnyByRelabelNo(relabelNo);
         if (value == null) throw notFound("Relabel application not found");
         return value;
     }