Browse Source

fix a端每日券bug

release_toaliyun_real
winter 4 years ago
parent
commit
72c1f52ce5
3 changed files with 7 additions and 4 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +5
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

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

@@ -154,7 +154,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/logout", "authc");

filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon");
filterChainDefinitionMap.put("/**", "anon");


shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);


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

@@ -66,9 +66,11 @@ public class BaseController {
* @return
*/
public TenantEntity getTenantInfo(){
Session session = SecurityUtils.getSubject().getSession();
String tenantId = (String)session.getAttribute(UserSession.tenantId);
String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
// 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;
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -2501,6 +2501,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}else {
vo.setVerifyUserCount(0);
}
vo.setCreateTime(date);
volist.add(vo);
}
return volist;


Loading…
Cancel
Save