| @@ -6,9 +6,11 @@ import java.text.SimpleDateFormat; | |||
| import java.util.Date; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.shiro.UserSession; | |||
| import com.iformall.utils.IPUtil; | |||
| import org.apache.shiro.SecurityUtils; | |||
| import org.apache.shiro.session.Session; | |||
| import org.springframework.web.bind.WebDataBinder; | |||
| import org.springframework.web.bind.annotation.InitBinder; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @@ -51,11 +53,30 @@ public class BaseController { | |||
| return userId; | |||
| } | |||
| @Deprecated | |||
| public String getTenantId(){ | |||
| String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); | |||
| return tenantId; | |||
| } | |||
| /** | |||
| * 返回租户信息 | |||
| * @return | |||
| */ | |||
| public TenantEntity getTenantInfo(){ | |||
| Session session = SecurityUtils.getSubject().getSession(); | |||
| String tenantId = (String)session.getAttribute(UserSession.tenantId); | |||
| TenantEntity tenantEntity = new TenantEntity(){{ | |||
| setTenantId(tenantId); | |||
| }}; | |||
| return tenantEntity; | |||
| } | |||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||
| dest.setTenantId(source.getTenantId()); | |||
| } | |||
| public String getIpAddr() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String ipaddress = IPUtil.getIpAddr(request); | |||
| @@ -65,12 +65,12 @@ public class WxBrandController extends BaseController { | |||
| @SystemControllerLog(description = "品牌-更新") | |||
| public ResultData update(@RequestBody WxBrand wxBrand) { | |||
| logger.debug("[" + getIpAddr() + "] WxBrandController::update"); | |||
| wxBrand.setTenantId(getTenantId()); | |||
| wxBrand.updateTenantInfo(getTenantInfo()); | |||
| if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ | |||
| //判断是否解绑商户 | |||
| WxMerchant wxMerchant = new WxMerchant(); | |||
| wxMerchant.setTenantId(wxBrand.getTenantId()); | |||
| wxMerchant.updateTenantInfo(wxBrand); | |||
| wxMerchant.setIsDel(0); | |||
| wxMerchant.setBrand(wxBrand.getId()); | |||
| List<WxMerchant> merchantList = wxMerchantService.findList(wxMerchant); | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller; | |||
| import cn.binarywang.wx.miniapp.api.WxMaService; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.WxAppinfo; | |||
| import com.iformall.domain.po.WxBuser; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| @@ -88,13 +89,26 @@ public class BaseController { | |||
| return user; | |||
| } | |||
| @Deprecated | |||
| public String getTenantId() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String tenantId = (String) request.getAttribute(Constant.TENANT_ID); | |||
| return tenantId; | |||
| } | |||
| public TenantEntity getTenantInfo() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String tenantId = (String) request.getAttribute(Constant.TENANT_ID); | |||
| TenantEntity tenantEntity = new TenantEntity() {{ | |||
| setTenantId(tenantId); | |||
| }}; | |||
| return tenantEntity; | |||
| } | |||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||
| dest.setTenantId(source.getTenantId()); | |||
| } | |||
| public WxAppinfo getAppInfo(String appId) { | |||
| return wxAppinfoService.getByAppId(appId); | |||
| } | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller; | |||
| import cn.binarywang.wx.miniapp.api.WxMaService; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.WxAppinfo; | |||
| import com.iformall.domain.po.WxCUser; | |||
| import com.iformall.domain.po.WxCUserBasicInfo; | |||
| @@ -68,12 +69,26 @@ public class BaseController { | |||
| }); | |||
| } | |||
| @Deprecated | |||
| public String getTenantId() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String tenantId = (String) request.getAttribute(Constant.TENANT_ID); | |||
| return tenantId; | |||
| } | |||
| public TenantEntity getTenantInfo() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String tenantId = (String) request.getAttribute(Constant.TENANT_ID); | |||
| TenantEntity tenantEntity = new TenantEntity() {{ | |||
| setTenantId(tenantId); | |||
| }}; | |||
| return tenantEntity; | |||
| } | |||
| public void setTenantInfo(TenantEntity dest, TenantEntity source) { | |||
| dest.setTenantId(source.getTenantId()); | |||
| } | |||
| public Long getUserId() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); | |||
| @@ -86,8 +101,10 @@ public class BaseController { | |||
| public WxCUser getUser() { | |||
| Long cUserId = getUserId(); | |||
| WxCUser user = wxCUserService.getById(cUserId); | |||
| if (user == null) | |||
| if (user == null) { | |||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | |||
| } | |||
| user.updateTenantInfo(getTenantInfo()); | |||
| return user; | |||
| } | |||
| @@ -13,11 +13,11 @@ public class BaseTenantEntity extends BaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| public void setTenantInfo(TenantEntity info) { | |||
| public void updateTenantInfo(TenantEntity info) { | |||
| setTenantId(info.getTenantId()); | |||
| } | |||
| public void setTenantInfo(BaseTenantEntity info) { | |||
| public void updateTenantInfo(BaseTenantEntity info) { | |||
| setTenantId(info.getTenantId()); | |||
| } | |||
| } | |||
| @@ -13,11 +13,11 @@ public class TenantEntity extends BaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| public void setTenantInfo(TenantEntity info) { | |||
| public void updateTenantInfo(TenantEntity info) { | |||
| setTenantId(info.getTenantId()); | |||
| } | |||
| public void setTenantInfo(BaseTenantEntity info) { | |||
| public void updateTenantInfo(BaseTenantEntity info) { | |||
| setTenantId(info.getTenantId()); | |||
| } | |||
| } | |||
| @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; | |||
| import com.fasterxml.jackson.annotation.*; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import java.util.*; | |||
| @@ -13,6 +14,7 @@ import java.util.*; | |||
| * @date 2019/4/24 14:32 | |||
| */ | |||
| @Data | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class InvestBaseEntity extends TenantEntity { | |||
| public static final String COLUMN_TYPE = "json"; | |||
| @@ -183,7 +183,7 @@ public class SysMenuController extends BaseController { | |||
| // 3.1 添加到mall_role_permission | |||
| try { | |||
| mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ | |||
| setTenantId(mallRole.getTenantId()); | |||
| updateTenantInfo(mallRole); | |||
| setPermissionId(mp.getId()); | |||
| setRoleId(mallRole.getId()); | |||
| }}); | |||
| @@ -234,7 +234,7 @@ public class SysMenuController extends BaseController { | |||
| }}); | |||
| for(MallRolePermission mallRolePermission: mallRolePermissions) { | |||
| List<MallRolePermission> mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| setPermissionId(menuId_XiTong); | |||
| }}); | |||
| @@ -242,7 +242,7 @@ public class SysMenuController extends BaseController { | |||
| // update 7L->50L | |||
| try { | |||
| mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setId(mallRolePermission.getId()); | |||
| setPermissionId(menuId_XiTong); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| @@ -342,14 +342,14 @@ public class SysMenuController extends BaseController { | |||
| }}); | |||
| for(MallRolePermission mallRolePermission: mallRolePermissions) { | |||
| List<MallRolePermission> mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| setPermissionId(menuId_Shop); | |||
| }}); | |||
| if (mallRolePermissionList.size() <= 0) { | |||
| try { | |||
| mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setPermissionId(menuId_Shop); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| }}); | |||
| @@ -368,14 +368,14 @@ public class SysMenuController extends BaseController { | |||
| }}); | |||
| for(MallRolePermission mallRolePermission: mallRolePermissions) { | |||
| List<MallRolePermission> mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| setPermissionId(menuId_Duojing); | |||
| }}); | |||
| if (mallRolePermissionList.size() <= 0) { | |||
| try { | |||
| mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setPermissionId(menuId_Duojing); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| }}); | |||
| @@ -440,14 +440,14 @@ public class SysMenuController extends BaseController { | |||
| }}); | |||
| for(MallRolePermission mallRolePermission: mallRolePermissions) { | |||
| List<MallRolePermission> mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| setPermissionId(menuId_Zhangdanliebiao); | |||
| }}); | |||
| if (mallRolePermissionList.size() <= 0) { | |||
| try { | |||
| mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setPermissionId(menuId_Zhangdanliebiao); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| }}); | |||
| @@ -494,14 +494,14 @@ public class SysMenuController extends BaseController { | |||
| }}); | |||
| for(MallRolePermission mallRolePermission: mallRolePermissions) { | |||
| List<MallRolePermission> mallRolePermissionList = mallRolePermissionService.getList(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| setPermissionId(menuId_ZhangdanMan); | |||
| }}); | |||
| if (mallRolePermissionList.size() <= 0) { | |||
| try { | |||
| mallRolePermissionService.saveOrUpdate(new MallRolePermission(){{ | |||
| setTenantId(mallRolePermission.getTenantId()); | |||
| updateTenantInfo(mallRolePermission); | |||
| setPermissionId(menuId_ZhangdanMan); | |||
| setRoleId(mallRolePermission.getRoleId()); | |||
| }}); | |||