Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
4a25433f37
4 changed files with 18 additions and 18 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
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java
  4. +5
    -5
      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
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java View File

@@ -49,7 +49,7 @@ public class WxEnergyFeesShop extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "公摊计算公式数组字符串", name = "formula")
private String formulaListStr;
@TableField(exist = false)
private List<String> formulaLis;
private List<String> formulaList;
@io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent")
private String formulaContent;
@TableField(exist = false)


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

@@ -571,8 +571,8 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) {
msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList()));
}
if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) {
msf.setFormulaListStr(JSON.toJSONString(record.getFormulaLis()));
if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) {
msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList()));
}
msf.setFormula(record.getFormula());
wxEnergyHelper.testCalcute(record.getFormula());
@@ -592,7 +592,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class));
}
if (StringUtils.isNotBlank(fs.getFormulaListStr())) {
fs.setFormulaLis(JSON.parseArray(fs.getFormulaListStr(), String.class));
fs.setFormulaList(JSON.parseArray(fs.getFormulaListStr(), String.class));
}
return fs;
}
@@ -604,8 +604,8 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) {
record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList()));
}
if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) {
record.setFormulaListStr(JSON.toJSONString(record.getFormulaLis()));
if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) {
record.setFormulaListStr(JSON.toJSONString(record.getFormulaList()));
}
wxEnergyHelper.testCalcute(record.getFormula());
wxEnergyFeesShopMapper.updateById(record);


Loading…
Cancel
Save