diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index eeb29cf3e..3cb5d329b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -167,6 +167,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/getAppMouldType") public ResultData getAppMouldType(Integer plat) { logger.debug("[" + getIpAddr() + "] WxAppinfoController::getAppMouldType"); + // if(plat == null){ // plat = EnumAppPlat.WX.getCode(); // } @@ -174,7 +175,7 @@ public class WxAppinfoController extends BaseController { // if(byCode == null){ // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); // } - WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(ifParentUpdateAloneTenantInfo().getTenantId(), null); + WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(getTenantInfo().getTenantId(), null); return new ResultData(new WxAppinfo(cAppInfo.getMouldType())); } @@ -190,7 +191,7 @@ public class WxAppinfoController extends BaseController { // updateAppinfo.setMouldType(appinfo.getMouldType()); // updateAppinfo.updateTenantInfo(ifParentUpdateAloneTenantInfo()); // wxAppinfoService.saveOrUpdate(updateAppinfo); - wxAppinfoService.updateCMouldType(ifParentUpdateAloneTenantInfo(),appinfo.getMouldType()); + wxAppinfoService.updateCMouldType(getTenantInfo(),appinfo.getMouldType()); return new ResultData(); } 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 9c403fa6d..f4c6cf1c8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -75,53 +75,6 @@ public class BaseController { return tenantEntity; } - /** - * 处理集团新增修改所需租户信息(只能取集团数据,积分/成长值/等级) - * 处理集团版 tenantId为空,parentTenantId为集团tenantId - * ifParentUpdateTenantInfo - */ - public TenantEntity getFinalTenantInfo() { - TenantEntity info = this.getTenantInfo(); - String tenantId = info.getTenantId(); - if(StringUtils.isNotBlank(info.getParentTenantId())){ - tenantId = info.getParentTenantId(); - } - TenantEntity tenantEntity = new TenantEntity(); - tenantEntity.setTenantId(tenantId); - return tenantEntity; - } - - /** - * 处理集团新增修改所需租户信息(广场独立修改,集团能修改各广场、自己信息) - * 处理集团版 tenantId为空,parentTenantId为集团tenantId - * ifParentUpdateTenantInfo - */ - public TenantEntity ifParentUpdateTenantInfo() { - TenantEntity info = this.getTenantInfo(); - if(StringUtils.isBlank(info.getTenantId())){ - info.setTenantId(info.getParentTenantId()); - info.setParentTenantId(null); - } - return info; - } - - /** - * 处理集团新增修改所需租户信息(各广场和集团独立修改) - * ifParentUpdateTenantInfo - */ - public TenantEntity ifParentUpdateAloneTenantInfo(){ - TenantEntity info = this.getTenantInfo(); - if(StringUtils.isBlank(info.getTenantId())){ - info.setTenantId(info.getParentTenantId()); - info.setParentTenantId(null); - } - if(getUser().getTenantId().equals(info.getTenantId())){ - return info; - } - new Exception("权限不足,只能独立操作"); - return null; - } - public String getIpAddr() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java index 681a88733..97ccea76b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java @@ -37,7 +37,7 @@ public class WxCustomizeModuleController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCustomizeModuleController::getDesc"); try { WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); if(wxCustomizeModule.getThemeType() == null){ wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); } @@ -67,7 +67,7 @@ public class WxCustomizeModuleController extends BaseController { if(wxCustomizeModule == null){ wxCustomizeModule = new WxCustomizeModule(); } - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); if(wxCustomizeModule.getThemeType() == null){ wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); } @@ -88,7 +88,7 @@ public class WxCustomizeModuleController extends BaseController { if(wxCustomizeModule == null){ wxCustomizeModule = new WxCustomizeModule(); } - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); if(wxCustomizeModule.getThemeType() == null){ wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); } @@ -109,7 +109,7 @@ public class WxCustomizeModuleController extends BaseController { if(wxCustomizeModule == null){ wxCustomizeModule = new WxCustomizeModule(); } - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); if(wxCustomizeModule.getThemeType() == null){ wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); } @@ -126,7 +126,7 @@ public class WxCustomizeModuleController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); wxCustomizeModule.setId(id); wxCustomizeModule = wxCustomizeModuleService.getById(wxCustomizeModule); return new ResultData(wxCustomizeModule); @@ -142,7 +142,7 @@ public class WxCustomizeModuleController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); wxCustomizeModule.setId(id); wxCustomizeModuleService.updateDel(wxCustomizeModule); return new ResultData(Result.SUCCESS, "删除成功", null); @@ -157,7 +157,7 @@ public class WxCustomizeModuleController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); wxCustomizeModule.setId(id); wxCustomizeModule.setSort(0); wxCustomizeModuleService.saveOrUpdate(wxCustomizeModule); @@ -171,7 +171,7 @@ public class WxCustomizeModuleController extends BaseController { if(wxCustomizeModule == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); if(wxCustomizeModule.getThemeType() == null){ wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); } @@ -194,7 +194,7 @@ public class WxCustomizeModuleController extends BaseController { if(wxCustomizeModule == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCustomizeModule.updateTenantInfo(getTenantInfo()); wxCustomizeModuleService.saveOrUpdate(wxCustomizeModule); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java index f41abb8fc..82ec87fd4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java @@ -37,7 +37,7 @@ public class WxTagsController extends BaseController { @SystemControllerLog(description = "会员管理-标签获取") public ResultData getAllList() { logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList"); - return new ResultData(wxTagsService.listAllVo(ifParentUpdateTenantInfo())); + return new ResultData(wxTagsService.listAllVo(getTenantInfo())); } @ApiOperation("查询会员用户人群") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index a8a798abd..1b2352b07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -892,7 +892,7 @@ public class WxRentContractController extends WxContractBaseController { for (WxRentContract wrc: clist) { List shopIds = wrc.shopIdsByRentInfo(); if (null != shopIds) { - List shops = wxShopService.getByIds(this.getFinalTenantInfo(),shopIds); + List shops = wxShopService.getByIds(this.getTenantInfo(),shopIds); String shopName = ""; for (WxShop shop : shops) { shopName = shopName +","+shop.getShopNumber(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index a8dcf842d..7bcde8520 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -117,7 +117,7 @@ public class WxUserStructureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.updateTenantInfo(getFinalTenantInfo()); + wxLevelConfig.updateTenantInfo(getTenantInfo()); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigService.findList(wxLevelConfig); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 149072699..cd9d7c609 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -75,7 +75,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCampaign.updateTenantInfo(getTenantInfo()); return wxCampaignService.saveOrUpdate(wxCampaign, EnumProjectPlat.FM); } @@ -85,7 +85,7 @@ public class WxCampaignController extends BaseController { public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCampaign.updateTenantInfo(getTenantInfo()); return wxCampaignService.addForPath(wxCampaign); } @@ -95,7 +95,7 @@ public class WxCampaignController extends BaseController { public ResultData addByAPPPath(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::addByAPPPath"); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxCampaign.updateTenantInfo(getTenantInfo()); return wxCampaignService.addByAPPPath(wxCampaign); } @@ -104,7 +104,6 @@ public class WxCampaignController extends BaseController { @SystemControllerLog(description = "宣传页-id更新") public ResultData update(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::update"); - ifParentUpdateAloneTenantInfo(); if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); @@ -119,7 +118,6 @@ public class WxCampaignController extends BaseController { @SystemControllerLog(description = "宣传页-更新状态") public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus"); - ifParentUpdateAloneTenantInfo(); WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId()); // check coupon 状态 if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { @@ -152,7 +150,6 @@ public class WxCampaignController extends BaseController { @SystemControllerLog(description = "宣传页-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxCampaignController::delete"); - ifParentUpdateAloneTenantInfo(); wxCampaignService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index c1a837042..1d37cb218 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -68,7 +68,7 @@ public class WxCouponController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); if(null != dataType && dataType == 1){ - wxCoupon.updateTenantInfo(ifParentUpdateTenantInfo()); + wxCoupon.updateTenantInfo(getTenantInfo()); }else{ wxCoupon.updateTenantInfo(getTenantInfo()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 143a94425..5388068ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -97,7 +97,7 @@ public class WxCUserBasicInfoController extends BaseController { WxCouponMerchantMapper wxCouponMerchantMapper; private void updateLevelParam(WxCUserBasicInfo info) { - List levelList = wxLevelConfigService.getByTenantInfo(getFinalTenantInfo()); + List levelList = wxLevelConfigService.getByTenantInfo(getTenantInfo()); levelList = levelList.stream() .sorted(Comparator.comparing(WxLevelConfig::getPoints)) .collect(Collectors.toList()); @@ -119,7 +119,7 @@ public class WxCUserBasicInfoController extends BaseController { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); } else { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); - List levelList = wxLevelConfigService.getByTenantInfo(getFinalTenantInfo()); + List levelList = wxLevelConfigService.getByTenantInfo(getTenantInfo()); for (WxLevelConfig levelConfig : levelList) { if (info.getPoins() >= levelConfig.getPoints()) { info.setLevel(levelConfig.getLevel()); @@ -142,7 +142,7 @@ public class WxCUserBasicInfoController extends BaseController { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId(),info.getFinalTenantId()); if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - info.setTagsList(wxCUserTagsService.findTagList(ifParentUpdateTenantInfo(), ids)); + info.setTagsList(wxCUserTagsService.findTagList(getTenantInfo(), ids)); } } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 2ca18e260..bad36c21d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -47,9 +47,9 @@ public class WxLevelConfigController extends BaseController { public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.updateTenantInfo(getFinalTenantInfo()); + wxLevelConfig.updateTenantInfo(getTenantInfo()); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); - final PageInfo page = wxLevelConfigService.listAsPage(getTenantInfo(),wxLevelConfig, pageNum, pageSize); + final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); return new ResultData(page); } @@ -59,7 +59,7 @@ public class WxLevelConfigController extends BaseController { public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { - if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); @@ -76,7 +76,7 @@ public class WxLevelConfigController extends BaseController { public ResultData updateCapabilities(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { - if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); @@ -95,7 +95,7 @@ public class WxLevelConfigController extends BaseController { if(wxLevelConfig.getId() != null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxLevelConfigService.deleteById(wxLevelConfig.getId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index fb0552d08..35bd4c69a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -37,7 +37,7 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "成长值-配置") public ResultData list() { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getFinalTenantInfo()); + WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantInfo()); if (scoreRules.getCreditLocked() == null) { scoreRules.setCreditLocked(EnumCreditLockedStatus.OPEN.getCode()); } @@ -51,7 +51,7 @@ public class WxScoreRulesController extends BaseController { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); if(wxScoreRules.getType() != null){ if(wxScoreRules.getType().equals(EnumScoreRules.SCORE.getCode()) || wxScoreRules.getType().equals(EnumScoreRules.CREDIT.getCode())){ - TenantEntity tenantEntity = ifParentUpdateTenantInfo(); + TenantEntity tenantEntity = getTenantInfo(); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } @@ -106,7 +106,7 @@ public class WxScoreRulesController extends BaseController { if (null == wxScoreRules.getCreditLocked()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); } - TenantEntity tenantEntity = ifParentUpdateTenantInfo(); + TenantEntity tenantEntity = getTenantInfo(); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index cb887bec4..c77a9e09c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -15,6 +15,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.service.*; import com.iformall.shiro.UserSession; import com.iformall.shiro.UseriFormallToken; +import com.iformall.utils.Constant; +import com.iformall.utils.RedisCacheUtils; import com.iformall.utils.ShiroUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -31,7 +33,9 @@ import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; import javax.imageio.ImageIO; import javax.servlet.ServletException; @@ -75,6 +79,10 @@ public class HomeController extends BaseController { @Autowired private WxMallService mallService; + @Autowired + @Qualifier("objectCommonRedisTemplate") + RedisTemplate redisTemplate; + @ApiOperation("验证码") @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { @@ -158,18 +166,18 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(info.getParentTenantId())) { - - Session session = SecurityUtils.getSubject().getSession(); - session.setAttribute(UserSession.tenantId, null); - session.setAttribute(UserSession.parentTenantId, info.getTenantId()); - -// // 集团用户获取子商场 -// List mallList = mallService.getSubByParentTenantId(info.getTenantId()); -// map.put("subMalls", JSON.toJSONString(mallList)); -// map.put("group", EnumGroupSupport.SUPPORT.getCode()); - } +// if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && +// StringUtils.isBlank(info.getParentTenantId())) { +// +// Session session = SecurityUtils.getSubject().getSession(); +// session.setAttribute(UserSession.tenantId, null); +// session.setAttribute(UserSession.parentTenantId, info.getTenantId()); +// +//// // 集团用户获取子商场 +//// List mallList = mallService.getSubByParentTenantId(info.getTenantId()); +//// map.put("subMalls", JSON.toJSONString(mallList)); +//// map.put("group", EnumGroupSupport.SUPPORT.getCode()); +// } try { String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); @@ -190,6 +198,14 @@ public class HomeController extends BaseController { return data; } + @ApiOperation("已知晓过期提醒") + @GetMapping("/knowMallValid") + public void knowMallValid() { + logger.debug("[" + getIpAddr() + "] HomeController::knowMallValid"); + String key = Constant.LOGIN_A_USER_VALID + getUser().getTenantId() + ":" + getUserId(); + RedisCacheUtils.cache(redisTemplate,key,true,3600*6); + } + private boolean isInMobileAdmin(MallUserInfo user) { // 检查用户是否有 移动端数据塔台 权限 @@ -304,18 +320,18 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "mall已过期"); } // Map map = new HashMap(); - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(info.getParentTenantId())) { - - Session session = SecurityUtils.getSubject().getSession(); - session.setAttribute(UserSession.tenantId, null); - session.setAttribute(UserSession.parentTenantId, info.getTenantId()); - -// // 集团用户获取子商场 -// List mallList = mallService.getSubByParentTenantId(info.getTenantId()); -// map.put("subMalls", JSON.toJSONString(mallList)); -// map.put("group", EnumGroupSupport.SUPPORT.getCode()); - } +// if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && +// StringUtils.isBlank(info.getParentTenantId())) { +// +// Session session = SecurityUtils.getSubject().getSession(); +// session.setAttribute(UserSession.tenantId, null); +// session.setAttribute(UserSession.parentTenantId, info.getTenantId()); +// +//// // 集团用户获取子商场 +//// List mallList = mallService.getSubByParentTenantId(info.getTenantId()); +//// map.put("subMalls", JSON.toJSONString(mallList)); +//// map.put("group", EnumGroupSupport.SUPPORT.getCode()); +// } try { String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); Cookie unameCookie = new Cookie("uname", cookieName); @@ -424,19 +440,19 @@ public class HomeController extends BaseController { logger.error("mall已过期"); return new ResultData(Result.ERROR, "mall已过期"); } -// Map map = new HashMap(); - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(info.getParentTenantId())) { - - Session session = SecurityUtils.getSubject().getSession(); - session.setAttribute(UserSession.tenantId, null); - session.setAttribute(UserSession.parentTenantId, info.getTenantId()); - -// // 集团用户获取子商场 -// List mallList = mallService.getSubByParentTenantId(info.getTenantId()); -// map.put("subMalls", JSON.toJSONString(mallList)); -// map.put("group", EnumGroupSupport.SUPPORT.getCode()); - } + Map map = new HashMap(); +// if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && +// StringUtils.isBlank(info.getParentTenantId())) { +// +// Session session = SecurityUtils.getSubject().getSession(); +// session.setAttribute(UserSession.tenantId, null); +// session.setAttribute(UserSession.parentTenantId, info.getTenantId()); +// +//// // 集团用户获取子商场 +//// List mallList = mallService.getSubByParentTenantId(info.getTenantId()); +//// map.put("subMalls", JSON.toJSONString(mallList)); +//// map.put("group", EnumGroupSupport.SUPPORT.getCode()); +// } String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); Cookie unameCookie = new Cookie("uname", cookieName); @@ -447,9 +463,9 @@ public class HomeController extends BaseController { // map.put("mall", JSON.toJSONString(mall)); // map.put("mallValid",mallService.mallValid(info.getId(),mall)); // map.put("saleType",mall.getSaleType()); -// map.put("withWechat", info.getWithWechat()); + map.put("withWechat", info.getWithWechat()); - return new ResultData(); + return new ResultData(map); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 70125f588..c627aef99 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -52,7 +52,7 @@ public class MallRoleController extends BaseController { @SystemControllerLog(description = "用户管理-role列表") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); - sysRole.updateTenantInfo(ifParentUpdateTenantInfo()); + sysRole.updateTenantInfo(getTenantInfo()); sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); for (MallRole r : page.getList()) { @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { MallRole role = sysRoleService.getById(sysRole.getId()); MallRolePermission p = new MallRolePermission(); p.setRoleId(role.getId()); - p.updateTenantInfo(ifParentUpdateTenantInfo()); + p.updateTenantInfo(getTenantInfo()); List pers = sysRolePermissionService.getList(p); String menus = ""; for (MallRolePermission rp : pers) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 39158e41d..60dbc70f0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); - userInfo.updateTenantInfo(ifParentUpdateTenantInfo()); + userInfo.updateTenantInfo(getTenantInfo()); userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index ce8bd4740..26fd86c06 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -73,7 +73,7 @@ public class SysMenuController extends BaseController { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); if (user.checkGroupAdmin()) { - TenantEntity tenantEntity = ifParentUpdateTenantInfo(); + TenantEntity tenantEntity = getTenantInfo(); user.setTenantId(tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { user.setParentTenantId(tenantEntity.getParentTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 4772dc986..6fa048cbf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -188,12 +188,6 @@ public class WechatLoginController extends BaseController { log.error(e.getMessage()); } } - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(info.getParentTenantId())) { - Session session = SecurityUtils.getSubject().getSession(); - session.setAttribute(UserSession.tenantId, null); - session.setAttribute(UserSession.parentTenantId, info.getTenantId()); - } try { String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); Cookie unameCookie = new Cookie("uname", cookieName); @@ -359,12 +353,6 @@ public class WechatLoginController extends BaseController { log.error(e.getMessage()); } } - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(info.getParentTenantId())) { - Session session = SecurityUtils.getSubject().getSession(); - session.setAttribute(UserSession.tenantId, null); - session.setAttribute(UserSession.parentTenantId, info.getTenantId()); - } // 登录cookie String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); Cookie unameCookie = new Cookie("uname", cookieName); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index f4613cd31..68e9ca110 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -22,7 +22,7 @@ public class WxAdminLogController extends BaseController { @PostMapping("pvlog") public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); - wxAdminLog.updateTenantInfo(ifParentUpdateTenantInfo()); + wxAdminLog.updateTenantInfo(getTenantInfo()); wxAdminLogService.saveLogCount(wxAdminLog); return new ResultData(); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index a6bf38d09..0f91e919e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -75,10 +75,6 @@ public class WxMallController extends BaseController { if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } - if(!mall.isValid()) { - logger.error("mall已过期"); - return new ResultData(Result.ERROR, "mall已过期"); - } if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { List mallList = wxMallService.getSubByParentTenantId(mall.getTenantId()); mall.setSubMalls(mallList); diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index 897b43597..332c9a86b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -22,7 +22,7 @@ public interface WxLevelConfigService { * @param pageSize * @return */ - PageInfo listAsPage(TenantEntity tenantEntity,WxLevelConfig record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize); List listByMerchantId(Long merchantId, WxLevelConfig record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 208e327aa..43fc67742 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -60,7 +60,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { RedisTemplate wxLevelConfigListRedisTemplate; @Override - public PageInfo listAsPage(TenantEntity tenantEntity,WxLevelConfig record, Integer pageIndex, Integer pageSize) { + public PageInfo listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize) { PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxLevelConfigMapper.findList(record)); for (int i=0;i