From a59ea2e841a20ecf9610547b01d615b59f10c48f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 15 Jan 2026 11:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=9B=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/ShopMerchantController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java index cb1bc0b61..630e9cdc4 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java +++ b/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 getMainMerchant() { - return CzgResult.success(shopMerchantService.getMainMerchant(StpKit.USER.getShopId())); + public CzgResult getMainMerchant(Long shopId) { + return CzgResult.success(shopMerchantService.getMainMerchant(shopId)); } }