diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index ab71e3397..3463ea458 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -163,7 +163,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); - filterChainDefinitionMap.put("/**", "anon"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 247597318..fa0b4e34a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -52,13 +52,13 @@ public class BaseController { }); } public MallUserInfo getUser(){ -// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - MallUserInfo user = new MallUserInfo(); - user.setId(321127266275430400L); - user.setName("alitest"); - user.setTenantId("789"); - user.setParentTenantId(null); - user.setIsAdmin(1); + MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); +// MallUserInfo user = new MallUserInfo(); +// user.setId(321127266275430400L); +// user.setName("alitest"); +// user.setTenantId("789"); +// user.setParentTenantId(null); +// user.setIsAdmin(1); return user; } @@ -80,10 +80,10 @@ public class BaseController { */ public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); -// String tenantId = (String)session.getAttribute(UserSession.tenantId); -// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - String tenantId = "789"; - String parentTenantId = null; + String tenantId = (String)session.getAttribute(UserSession.tenantId); + String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); +// String tenantId = "789"; +// String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index d95690078..ee2991cd3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -397,6 +397,7 @@ public class WxEnergyController extends BaseController { @ApiOperation("店铺修改计费标准") @PostMapping("updateFeesShop") public ResultData updateFeesShop(@RequestBody WxEnergyFeesShop record) { + record.updateTenantInfo(getTenantInfo()); wxEnergyService.updateFeesShop(record); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 67e4a8e3a..ab752820c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -732,6 +732,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public void updateFeesShop(WxEnergyFeesShop record) { + WxEnergyFeesShop fessShop = wxEnergyFeesShopMapper.selectById(record.getId(), record.getTenantId()); Date date = new Date(); record.setUpdateTime(date); if (record.getIsPublic() == EnumYesOrNo.YES.getCode()) { @@ -745,7 +746,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { record.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); } - WxShop shop = wxShopService.getById(record.getShopId()); + + WxShop shop = wxShopService.getById(fessShop.getShopId()); if (StringUtils.isBlank(shop.getPulicRate())) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数"); }