获取进件信息

cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java

@@ -6,7 +6,6 @@ import com.czg.order.dto.ShopMerchantDTO;
 import com.czg.order.entity.ShopDirectMerchant;
 import com.czg.order.service.ShopMerchantService;
 import com.czg.resp.CzgResult;
-import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,8 +50,9 @@ public class ShopMerchantController {
     /**
      * 获取当前店铺的主店进件信息
      */
+    @SaAdminCheckRole("管理员")
     @GetMapping("getMainMerchant")
-    public CzgResult<ShopDirectMerchant> getMainMerchant() {
-        return CzgResult.success(shopMerchantService.getMainMerchant(StpKit.USER.getShopId()));
+    public CzgResult<ShopDirectMerchant> getMainMerchant(Long shopId) {
+        return CzgResult.success(shopMerchantService.getMainMerchant(shopId));
     }
 }