| @@ -167,6 +167,7 @@ public class WxAppinfoController extends BaseController { | |||||
| @GetMapping("/getAppMouldType") | @GetMapping("/getAppMouldType") | ||||
| public ResultData getAppMouldType(Integer plat) { | public ResultData getAppMouldType(Integer plat) { | ||||
| logger.debug("[" + getIpAddr() + "] WxAppinfoController::getAppMouldType"); | logger.debug("[" + getIpAddr() + "] WxAppinfoController::getAppMouldType"); | ||||
| // if(plat == null){ | // if(plat == null){ | ||||
| // plat = EnumAppPlat.WX.getCode(); | // plat = EnumAppPlat.WX.getCode(); | ||||
| // } | // } | ||||
| @@ -174,7 +175,7 @@ public class WxAppinfoController extends BaseController { | |||||
| // if(byCode == null){ | // if(byCode == null){ | ||||
| // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | // 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())); | return new ResultData(new WxAppinfo(cAppInfo.getMouldType())); | ||||
| } | } | ||||
| @@ -190,7 +191,7 @@ public class WxAppinfoController extends BaseController { | |||||
| // updateAppinfo.setMouldType(appinfo.getMouldType()); | // updateAppinfo.setMouldType(appinfo.getMouldType()); | ||||
| // updateAppinfo.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | // updateAppinfo.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | ||||
| // wxAppinfoService.saveOrUpdate(updateAppinfo); | // wxAppinfoService.saveOrUpdate(updateAppinfo); | ||||
| wxAppinfoService.updateCMouldType(ifParentUpdateAloneTenantInfo(),appinfo.getMouldType()); | |||||
| wxAppinfoService.updateCMouldType(getTenantInfo(),appinfo.getMouldType()); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -75,53 +75,6 @@ public class BaseController { | |||||
| return tenantEntity; | 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() { | public String getIpAddr() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| String ipaddress = IPUtil.getIpAddr(request); | String ipaddress = IPUtil.getIpAddr(request); | ||||
| @@ -37,7 +37,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCustomizeModuleController::getDesc"); | logger.debug("[" + getIpAddr() + "] WxCustomizeModuleController::getDesc"); | ||||
| try { | try { | ||||
| WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| if(wxCustomizeModule.getThemeType() == null){ | if(wxCustomizeModule.getThemeType() == null){ | ||||
| wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | ||||
| } | } | ||||
| @@ -67,7 +67,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| if(wxCustomizeModule == null){ | if(wxCustomizeModule == null){ | ||||
| wxCustomizeModule = new WxCustomizeModule(); | wxCustomizeModule = new WxCustomizeModule(); | ||||
| } | } | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| if(wxCustomizeModule.getThemeType() == null){ | if(wxCustomizeModule.getThemeType() == null){ | ||||
| wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | ||||
| } | } | ||||
| @@ -88,7 +88,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| if(wxCustomizeModule == null){ | if(wxCustomizeModule == null){ | ||||
| wxCustomizeModule = new WxCustomizeModule(); | wxCustomizeModule = new WxCustomizeModule(); | ||||
| } | } | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| if(wxCustomizeModule.getThemeType() == null){ | if(wxCustomizeModule.getThemeType() == null){ | ||||
| wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | ||||
| } | } | ||||
| @@ -109,7 +109,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| if(wxCustomizeModule == null){ | if(wxCustomizeModule == null){ | ||||
| wxCustomizeModule = new WxCustomizeModule(); | wxCustomizeModule = new WxCustomizeModule(); | ||||
| } | } | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| if(wxCustomizeModule.getThemeType() == null){ | if(wxCustomizeModule.getThemeType() == null){ | ||||
| wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | ||||
| } | } | ||||
| @@ -126,7 +126,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| wxCustomizeModule.setId(id); | wxCustomizeModule.setId(id); | ||||
| wxCustomizeModule = wxCustomizeModuleService.getById(wxCustomizeModule); | wxCustomizeModule = wxCustomizeModuleService.getById(wxCustomizeModule); | ||||
| return new ResultData(wxCustomizeModule); | return new ResultData(wxCustomizeModule); | ||||
| @@ -142,7 +142,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| wxCustomizeModule.setId(id); | wxCustomizeModule.setId(id); | ||||
| wxCustomizeModuleService.updateDel(wxCustomizeModule); | wxCustomizeModuleService.updateDel(wxCustomizeModule); | ||||
| return new ResultData(Result.SUCCESS, "删除成功", null); | return new ResultData(Result.SUCCESS, "删除成功", null); | ||||
| @@ -157,7 +157,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | WxCustomizeModule wxCustomizeModule = new WxCustomizeModule(); | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| wxCustomizeModule.setId(id); | wxCustomizeModule.setId(id); | ||||
| wxCustomizeModule.setSort(0); | wxCustomizeModule.setSort(0); | ||||
| wxCustomizeModuleService.saveOrUpdate(wxCustomizeModule); | wxCustomizeModuleService.saveOrUpdate(wxCustomizeModule); | ||||
| @@ -171,7 +171,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| if(wxCustomizeModule == null){ | if(wxCustomizeModule == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| if(wxCustomizeModule.getThemeType() == null){ | if(wxCustomizeModule.getThemeType() == null){ | ||||
| wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | wxCustomizeModule.setThemeType(EnumThemeType.C.getCode()); | ||||
| } | } | ||||
| @@ -194,7 +194,7 @@ public class WxCustomizeModuleController extends BaseController { | |||||
| if(wxCustomizeModule == null){ | if(wxCustomizeModule == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| wxCustomizeModule.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCustomizeModule.updateTenantInfo(getTenantInfo()); | |||||
| wxCustomizeModuleService.saveOrUpdate(wxCustomizeModule); | wxCustomizeModuleService.saveOrUpdate(wxCustomizeModule); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -37,7 +37,7 @@ public class WxTagsController extends BaseController { | |||||
| @SystemControllerLog(description = "会员管理-标签获取") | @SystemControllerLog(description = "会员管理-标签获取") | ||||
| public ResultData getAllList() { | public ResultData getAllList() { | ||||
| logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList"); | logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList"); | ||||
| return new ResultData(wxTagsService.listAllVo(ifParentUpdateTenantInfo())); | |||||
| return new ResultData(wxTagsService.listAllVo(getTenantInfo())); | |||||
| } | } | ||||
| @ApiOperation("查询会员用户人群") | @ApiOperation("查询会员用户人群") | ||||
| @@ -892,7 +892,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| for (WxRentContract wrc: clist) { | for (WxRentContract wrc: clist) { | ||||
| List<Long> shopIds = wrc.shopIdsByRentInfo(); | List<Long> shopIds = wrc.shopIdsByRentInfo(); | ||||
| if (null != shopIds) { | if (null != shopIds) { | ||||
| List<WxShop> shops = wxShopService.getByIds(this.getFinalTenantInfo(),shopIds); | |||||
| List<WxShop> shops = wxShopService.getByIds(this.getTenantInfo(),shopIds); | |||||
| String shopName = ""; | String shopName = ""; | ||||
| for (WxShop shop : shops) { | for (WxShop shop : shops) { | ||||
| shopName = shopName +","+shop.getShopNumber(); | shopName = shopName +","+shop.getShopNumber(); | ||||
| @@ -117,7 +117,7 @@ public class WxUserStructureController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); | logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); | ||||
| WxLevelConfig wxLevelConfig = new WxLevelConfig(); | WxLevelConfig wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.updateTenantInfo(getFinalTenantInfo()); | |||||
| wxLevelConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | ||||
| List<WxLevelConfig> levelList = wxLevelConfigService.findList(wxLevelConfig); | List<WxLevelConfig> levelList = wxLevelConfigService.findList(wxLevelConfig); | ||||
| @@ -75,7 +75,7 @@ public class WxCampaignController extends BaseController { | |||||
| wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); | wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); | ||||
| } | } | ||||
| wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| return wxCampaignService.saveOrUpdate(wxCampaign, EnumProjectPlat.FM); | return wxCampaignService.saveOrUpdate(wxCampaign, EnumProjectPlat.FM); | ||||
| } | } | ||||
| @@ -85,7 +85,7 @@ public class WxCampaignController extends BaseController { | |||||
| public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { | public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); | logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); | ||||
| wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| return wxCampaignService.addForPath(wxCampaign); | return wxCampaignService.addForPath(wxCampaign); | ||||
| } | } | ||||
| @@ -95,7 +95,7 @@ public class WxCampaignController extends BaseController { | |||||
| public ResultData addByAPPPath(@RequestBody WxCampaign wxCampaign) { | public ResultData addByAPPPath(@RequestBody WxCampaign wxCampaign) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCampaignController::addByAPPPath"); | logger.debug("[" + getIpAddr() + "] WxCampaignController::addByAPPPath"); | ||||
| wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); | |||||
| wxCampaign.updateTenantInfo(getTenantInfo()); | |||||
| return wxCampaignService.addByAPPPath(wxCampaign); | return wxCampaignService.addByAPPPath(wxCampaign); | ||||
| } | } | ||||
| @@ -104,7 +104,6 @@ public class WxCampaignController extends BaseController { | |||||
| @SystemControllerLog(description = "宣传页-id更新") | @SystemControllerLog(description = "宣传页-id更新") | ||||
| public ResultData update(@RequestBody WxCampaign wxCampaign) { | public ResultData update(@RequestBody WxCampaign wxCampaign) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCampaignController::update"); | logger.debug("[" + getIpAddr() + "] WxCampaignController::update"); | ||||
| ifParentUpdateAloneTenantInfo(); | |||||
| if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { | if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { | ||||
| String[] arys = wxCampaign.getCouponIds().split(","); | String[] arys = wxCampaign.getCouponIds().split(","); | ||||
| wxCampaign.setCouponIds(JSON.toJSONString(arys)); | wxCampaign.setCouponIds(JSON.toJSONString(arys)); | ||||
| @@ -119,7 +118,6 @@ public class WxCampaignController extends BaseController { | |||||
| @SystemControllerLog(description = "宣传页-更新状态") | @SystemControllerLog(description = "宣传页-更新状态") | ||||
| public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) { | public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus"); | logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus"); | ||||
| ifParentUpdateAloneTenantInfo(); | |||||
| WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId()); | WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId()); | ||||
| // check coupon 状态 | // check coupon 状态 | ||||
| if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { | if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { | ||||
| @@ -152,7 +150,6 @@ public class WxCampaignController extends BaseController { | |||||
| @SystemControllerLog(description = "宣传页-删除") | @SystemControllerLog(description = "宣传页-删除") | ||||
| public ResultData delete(Long id) { | public ResultData delete(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCampaignController::delete"); | logger.debug("[" + getIpAddr() + "] WxCampaignController::delete"); | ||||
| ifParentUpdateAloneTenantInfo(); | |||||
| wxCampaignService.deleteById(id); | wxCampaignService.deleteById(id); | ||||
| return new ResultData(Result.SUCCESS, "删除成功", null); | return new ResultData(Result.SUCCESS, "删除成功", null); | ||||
| } | } | ||||
| @@ -68,7 +68,7 @@ public class WxCouponController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | ||||
| if (wxCoupon == null) wxCoupon = new WxCoupon(); | if (wxCoupon == null) wxCoupon = new WxCoupon(); | ||||
| if(null != dataType && dataType == 1){ | if(null != dataType && dataType == 1){ | ||||
| wxCoupon.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||||
| }else{ | }else{ | ||||
| wxCoupon.updateTenantInfo(getTenantInfo()); | wxCoupon.updateTenantInfo(getTenantInfo()); | ||||
| } | } | ||||
| @@ -97,7 +97,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| WxCouponMerchantMapper wxCouponMerchantMapper; | WxCouponMerchantMapper wxCouponMerchantMapper; | ||||
| private void updateLevelParam(WxCUserBasicInfo info) { | private void updateLevelParam(WxCUserBasicInfo info) { | ||||
| List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(getFinalTenantInfo()); | |||||
| List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(getTenantInfo()); | |||||
| levelList = levelList.stream() | levelList = levelList.stream() | ||||
| .sorted(Comparator.comparing(WxLevelConfig::getPoints)) | .sorted(Comparator.comparing(WxLevelConfig::getPoints)) | ||||
| .collect(Collectors.toList()); | .collect(Collectors.toList()); | ||||
| @@ -119,7 +119,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); | info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); | ||||
| } else { | } else { | ||||
| info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); | info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); | ||||
| List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(getFinalTenantInfo()); | |||||
| List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(getTenantInfo()); | |||||
| for (WxLevelConfig levelConfig : levelList) { | for (WxLevelConfig levelConfig : levelList) { | ||||
| if (info.getPoins() >= levelConfig.getPoints()) { | if (info.getPoins() >= levelConfig.getPoints()) { | ||||
| info.setLevel(levelConfig.getLevel()); | info.setLevel(levelConfig.getLevel()); | ||||
| @@ -142,7 +142,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId(),info.getFinalTenantId()); | WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId(),info.getFinalTenantId()); | ||||
| if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { | if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { | ||||
| List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); | List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); | ||||
| info.setTagsList(wxCUserTagsService.findTagList(ifParentUpdateTenantInfo(), ids)); | |||||
| info.setTagsList(wxCUserTagsService.findTagList(getTenantInfo(), ids)); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -47,9 +47,9 @@ public class WxLevelConfigController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); | logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); | ||||
| if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); | if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.updateTenantInfo(getFinalTenantInfo()); | |||||
| wxLevelConfig.updateTenantInfo(getTenantInfo()); | |||||
| wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | ||||
| final PageInfo<WxLevelConfig> page = wxLevelConfigService.listAsPage(getTenantInfo(),wxLevelConfig, pageNum, pageSize); | |||||
| final PageInfo<WxLevelConfig> page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -59,7 +59,7 @@ public class WxLevelConfigController extends BaseController { | |||||
| public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) { | public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) { | ||||
| logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); | logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); | ||||
| try { | try { | ||||
| if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { | |||||
| if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { | |||||
| return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | ||||
| } | } | ||||
| wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); | wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); | ||||
| @@ -76,7 +76,7 @@ public class WxLevelConfigController extends BaseController { | |||||
| public ResultData updateCapabilities(@RequestBody List<WxLevelConfig> levelConfigs) { | public ResultData updateCapabilities(@RequestBody List<WxLevelConfig> levelConfigs) { | ||||
| logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); | logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); | ||||
| try { | try { | ||||
| if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { | |||||
| if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { | |||||
| return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | ||||
| } | } | ||||
| wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); | wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); | ||||
| @@ -95,7 +95,7 @@ public class WxLevelConfigController extends BaseController { | |||||
| if(wxLevelConfig.getId() != null){ | if(wxLevelConfig.getId() != null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_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(), "广场用户无此权限"); | return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | ||||
| } | } | ||||
| wxLevelConfigService.deleteById(wxLevelConfig.getId()); | wxLevelConfigService.deleteById(wxLevelConfig.getId()); | ||||
| @@ -37,7 +37,7 @@ public class WxScoreRulesController extends BaseController { | |||||
| @SystemControllerLog(description = "成长值-配置") | @SystemControllerLog(description = "成长值-配置") | ||||
| public ResultData list() { | public ResultData list() { | ||||
| logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); | logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); | ||||
| WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getFinalTenantInfo()); | |||||
| WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantInfo()); | |||||
| if (scoreRules.getCreditLocked() == null) { | if (scoreRules.getCreditLocked() == null) { | ||||
| scoreRules.setCreditLocked(EnumCreditLockedStatus.OPEN.getCode()); | scoreRules.setCreditLocked(EnumCreditLockedStatus.OPEN.getCode()); | ||||
| } | } | ||||
| @@ -51,7 +51,7 @@ public class WxScoreRulesController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); | logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); | ||||
| if(wxScoreRules.getType() != null){ | if(wxScoreRules.getType() != null){ | ||||
| if(wxScoreRules.getType().equals(EnumScoreRules.SCORE.getCode()) || wxScoreRules.getType().equals(EnumScoreRules.CREDIT.getCode())){ | if(wxScoreRules.getType().equals(EnumScoreRules.SCORE.getCode()) || wxScoreRules.getType().equals(EnumScoreRules.CREDIT.getCode())){ | ||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | ||||
| return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | ||||
| } | } | ||||
| @@ -106,7 +106,7 @@ public class WxScoreRulesController extends BaseController { | |||||
| if (null == wxScoreRules.getCreditLocked()) { | if (null == wxScoreRules.getCreditLocked()) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | ||||
| return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); | ||||
| } | } | ||||
| @@ -15,6 +15,8 @@ import com.iformall.annotation.SystemControllerLog; | |||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.shiro.UserSession; | import com.iformall.shiro.UserSession; | ||||
| import com.iformall.shiro.UseriFormallToken; | import com.iformall.shiro.UseriFormallToken; | ||||
| import com.iformall.utils.Constant; | |||||
| import com.iformall.utils.RedisCacheUtils; | |||||
| import com.iformall.utils.ShiroUtils; | import com.iformall.utils.ShiroUtils; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -31,7 +33,9 @@ import org.apache.shiro.subject.Subject; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.beans.factory.annotation.Qualifier; | |||||
| import org.springframework.beans.factory.annotation.Value; | import org.springframework.beans.factory.annotation.Value; | ||||
| import org.springframework.data.redis.core.RedisTemplate; | |||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import javax.imageio.ImageIO; | import javax.imageio.ImageIO; | ||||
| import javax.servlet.ServletException; | import javax.servlet.ServletException; | ||||
| @@ -75,6 +79,10 @@ public class HomeController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxMallService mallService; | private WxMallService mallService; | ||||
| @Autowired | |||||
| @Qualifier("objectCommonRedisTemplate") | |||||
| RedisTemplate<String, Object> redisTemplate; | |||||
| @ApiOperation("验证码") | @ApiOperation("验证码") | ||||
| @GetMapping("/captcha.jpg") | @GetMapping("/captcha.jpg") | ||||
| public void captcha(HttpServletResponse response)throws ServletException, IOException { | public void captcha(HttpServletResponse response)throws ServletException, IOException { | ||||
| @@ -158,18 +166,18 @@ public class HomeController extends BaseController { | |||||
| return new ResultData(Result.ERROR, "mall已过期"); | return new ResultData(Result.ERROR, "mall已过期"); | ||||
| } | } | ||||
| Map map = new HashMap(); | 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<WxMall> 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<WxMall> mallList = mallService.getSubByParentTenantId(info.getTenantId()); | |||||
| //// map.put("subMalls", JSON.toJSONString(mallList)); | |||||
| //// map.put("group", EnumGroupSupport.SUPPORT.getCode()); | |||||
| // } | |||||
| try { | try { | ||||
| String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | ||||
| @@ -190,6 +198,14 @@ public class HomeController extends BaseController { | |||||
| return data; | 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) { | private boolean isInMobileAdmin(MallUserInfo user) { | ||||
| // 检查用户是否有 移动端数据塔台 权限 | // 检查用户是否有 移动端数据塔台 权限 | ||||
| @@ -304,18 +320,18 @@ public class HomeController extends BaseController { | |||||
| return new ResultData(Result.ERROR, "mall已过期"); | return new ResultData(Result.ERROR, "mall已过期"); | ||||
| } | } | ||||
| // Map map = new HashMap(); | // 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<WxMall> 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<WxMall> mallList = mallService.getSubByParentTenantId(info.getTenantId()); | |||||
| //// map.put("subMalls", JSON.toJSONString(mallList)); | |||||
| //// map.put("group", EnumGroupSupport.SUPPORT.getCode()); | |||||
| // } | |||||
| try { | try { | ||||
| String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | ||||
| Cookie unameCookie = new Cookie("uname", cookieName); | Cookie unameCookie = new Cookie("uname", cookieName); | ||||
| @@ -424,19 +440,19 @@ public class HomeController extends BaseController { | |||||
| logger.error("mall已过期"); | logger.error("mall已过期"); | ||||
| return new ResultData(Result.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<WxMall> 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<WxMall> 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"); | String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | ||||
| Cookie unameCookie = new Cookie("uname", cookieName); | Cookie unameCookie = new Cookie("uname", cookieName); | ||||
| @@ -447,9 +463,9 @@ public class HomeController extends BaseController { | |||||
| // map.put("mall", JSON.toJSONString(mall)); | // map.put("mall", JSON.toJSONString(mall)); | ||||
| // map.put("mallValid",mallService.mallValid(info.getId(),mall)); | // map.put("mallValid",mallService.mallValid(info.getId(),mall)); | ||||
| // map.put("saleType",mall.getSaleType()); | // 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) { | } catch (MallinkException e) { | ||||
| return new ResultData(e.getErrorCode(), e.getMessage()); | return new ResultData(e.getErrorCode(), e.getMessage()); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -52,7 +52,7 @@ public class MallRoleController extends BaseController { | |||||
| @SystemControllerLog(description = "用户管理-role列表") | @SystemControllerLog(description = "用户管理-role列表") | ||||
| public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { | public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallRoleController::list"); | logger.debug("[" + getIpAddr() + "] MallRoleController::list"); | ||||
| sysRole.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| sysRole.updateTenantInfo(getTenantInfo()); | |||||
| sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); | sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<MallRole> page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); | final PageInfo<MallRole> page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); | ||||
| for (MallRole r : page.getList()) { | for (MallRole r : page.getList()) { | ||||
| @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { | |||||
| MallRole role = sysRoleService.getById(sysRole.getId()); | MallRole role = sysRoleService.getById(sysRole.getId()); | ||||
| MallRolePermission p = new MallRolePermission(); | MallRolePermission p = new MallRolePermission(); | ||||
| p.setRoleId(role.getId()); | p.setRoleId(role.getId()); | ||||
| p.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| p.updateTenantInfo(getTenantInfo()); | |||||
| List<MallRolePermission> pers = sysRolePermissionService.getList(p); | List<MallRolePermission> pers = sysRolePermissionService.getList(p); | ||||
| String menus = ""; | String menus = ""; | ||||
| for (MallRolePermission rp : pers) { | for (MallRolePermission rp : pers) { | ||||
| @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { | |||||
| public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | ||||
| userInfo.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | ||||
| for (MallUserInfo u : page.getList()) { | for (MallUserInfo u : page.getList()) { | ||||
| @@ -73,7 +73,7 @@ public class SysMenuController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); | logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| if (user.checkGroupAdmin()) { | if (user.checkGroupAdmin()) { | ||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| user.setTenantId(tenantEntity.getTenantId()); | user.setTenantId(tenantEntity.getTenantId()); | ||||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | ||||
| user.setParentTenantId(tenantEntity.getParentTenantId()); | user.setParentTenantId(tenantEntity.getParentTenantId()); | ||||
| @@ -188,12 +188,6 @@ public class WechatLoginController extends BaseController { | |||||
| log.error(e.getMessage()); | 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 { | try { | ||||
| String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | ||||
| Cookie unameCookie = new Cookie("uname", cookieName); | Cookie unameCookie = new Cookie("uname", cookieName); | ||||
| @@ -359,12 +353,6 @@ public class WechatLoginController extends BaseController { | |||||
| log.error(e.getMessage()); | 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 | // 登录cookie | ||||
| String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); | ||||
| Cookie unameCookie = new Cookie("uname", cookieName); | Cookie unameCookie = new Cookie("uname", cookieName); | ||||
| @@ -22,7 +22,7 @@ public class WxAdminLogController extends BaseController { | |||||
| @PostMapping("pvlog") | @PostMapping("pvlog") | ||||
| public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { | public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { | ||||
| logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); | logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); | ||||
| wxAdminLog.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| wxAdminLog.updateTenantInfo(getTenantInfo()); | |||||
| wxAdminLogService.saveLogCount(wxAdminLog); | wxAdminLogService.saveLogCount(wxAdminLog); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -75,10 +75,6 @@ public class WxMallController extends BaseController { | |||||
| if (mall == null) { | if (mall == null) { | ||||
| return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); | 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())) { | if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { | ||||
| List<WxMall> mallList = wxMallService.getSubByParentTenantId(mall.getTenantId()); | List<WxMall> mallList = wxMallService.getSubByParentTenantId(mall.getTenantId()); | ||||
| mall.setSubMalls(mallList); | mall.setSubMalls(mallList); | ||||
| @@ -22,7 +22,7 @@ public interface WxLevelConfigService { | |||||
| * @param pageSize | * @param pageSize | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| PageInfo<WxLevelConfig> listAsPage(TenantEntity tenantEntity,WxLevelConfig record, Integer pageIndex, Integer pageSize); | |||||
| PageInfo<WxLevelConfig> listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize); | |||||
| List<WxLevelConfig> listByMerchantId(Long merchantId, WxLevelConfig record); | List<WxLevelConfig> listByMerchantId(Long merchantId, WxLevelConfig record); | ||||
| @@ -60,7 +60,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| RedisTemplate<String, Object> wxLevelConfigListRedisTemplate; | RedisTemplate<String, Object> wxLevelConfigListRedisTemplate; | ||||
| @Override | @Override | ||||
| public PageInfo<WxLevelConfig> listAsPage(TenantEntity tenantEntity,WxLevelConfig record, Integer pageIndex, Integer pageSize) { | |||||
| public PageInfo<WxLevelConfig> listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize) { | |||||
| PageInfo<WxLevelConfig> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxLevelConfigMapper.findList(record)); | PageInfo<WxLevelConfig> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxLevelConfigMapper.findList(record)); | ||||
| for (int i=0;i<page.getList().size();i++) | for (int i=0;i<page.getList().size();i++) | ||||
| @@ -77,7 +77,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| l.setScale(WxLevelConfig.DEFAULT_SCALE); | l.setScale(WxLevelConfig.DEFAULT_SCALE); | ||||
| } | } | ||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.updateTenantInfo(tenantEntity); | |||||
| dto.updateTenantInfo(record); | |||||
| dto.setLevelStartScore(l.getPoints()); | dto.setLevelStartScore(l.getPoints()); | ||||
| if (i + 1<page.getList().size()) | if (i + 1<page.getList().size()) | ||||
| dto.setLevelEndScore(page.getList().get(i+1).getPoints()); | dto.setLevelEndScore(page.getList().get(i+1).getPoints()); | ||||
| @@ -1247,11 +1247,17 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| if (CollectionUtils.isNotEmpty(ownerList)) { | if (CollectionUtils.isNotEmpty(ownerList)) { | ||||
| for (Object userId : ownerList) { | for (Object userId : ownerList) { | ||||
| if (userId instanceof Long) { | if (userId instanceof Long) { | ||||
| ownerInfo.add(usersMap.get(userId)); | |||||
| MallUserInfo userInfo = usersMap.get(userId); | |||||
| if(userInfo != null){ | |||||
| ownerInfo.add(userInfo); | |||||
| } | |||||
| } else { | } else { | ||||
| String uId = (String) userId; | String uId = (String) userId; | ||||
| if (StringUtils.isNotBlank(uId)) { | if (StringUtils.isNotBlank(uId)) { | ||||
| ownerInfo.add(usersMap.get(Long.parseLong(uId))); | |||||
| MallUserInfo userInfo = usersMap.get(Long.parseLong(uId)); | |||||
| if(userInfo != null){ | |||||
| ownerInfo.add(userInfo); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||