Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
80f1aa23bb
4 changed files with 16 additions and 13 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +11
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  3. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  4. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java View File

@@ -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);


+ 11
- 11
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java View File

@@ -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);


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java View File

@@ -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();
}


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java View File

@@ -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(),"店铺未设置公摊系数");
}


Loading…
Cancel
Save