diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java index 255536b31..b41d77e18 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java @@ -46,7 +46,7 @@ public class ShopRechargeController { if (!StpKit.USER.isManager()) { return CzgResult.failure("无权限操作"); } - return CzgResult.success(shopRechargeService.detail(StpKit.USER.getHeadId())); + return CzgResult.success(shopRechargeService.detail(StpKit.USER.getMainShopId())); } /** diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java index 1c6adbfe0..ccac57bfe 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java @@ -5,7 +5,6 @@ import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaRequest; import cn.dev33.satoken.dao.SaTokenDao; -import cn.dev33.satoken.exception.NotPermissionException; import cn.dev33.satoken.fun.SaFunction; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.session.SaSession; @@ -16,10 +15,8 @@ import cn.dev33.satoken.stp.StpLogic; import cn.hutool.core.util.StrUtil; import com.czg.exception.ApiNotPrintException; import com.czg.exception.CzgException; -import com.mybatisflex.core.row.DbChain; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -113,6 +110,7 @@ public class MyStpLogic { } if (headShopId != null) { session.set("headShopId", headShopId); + session.set("mainShopId", headShopId); } if (shopName != null) { session.set("shopName", shopName); @@ -126,6 +124,11 @@ public class MyStpLogic { return (Boolean) logic.getSession().get("isMainShop"); } + public Long getMainShopId() { + StpLogic logic = getLogic(); + return (Long) logic.getSession().get("mainShopId"); + } + public String getPlatForm() { StpLogic logic = getLogic(); Object platForm = logic.getSession().get("platForm");