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 ee3e4aa6c..63363c223 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -76,7 +76,7 @@ public class BaseController { } /** - * 处理集团新增修改所需租户信息 + * 处理集团新增修改所需租户信息(广场独立修改,集团修改全部) * ifParentUpdateTenantInfo */ public TenantEntity ifParentUpdateTenantInfo() { @@ -88,6 +88,23 @@ public class BaseController { 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/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 9a26cd30b..4d9205386 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { wxCampaign.setStatus(null); } - wxCampaign.updateTenantInfo(getTenantInfo()); + wxCampaign.updateTenantInfo(ifParentUpdateTenantInfo()); wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); @@ -78,7 +78,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.updateTenantInfo(getTenantInfo()); + wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); wxCampaignService.saveOrUpdate(wxCampaign); return new ResultData(); } @@ -89,7 +89,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(getTenantInfo()); + wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); wxCampaignService.addForPath(wxCampaign); return new ResultData(); } @@ -99,7 +99,7 @@ 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)); @@ -114,6 +114,7 @@ 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())) { @@ -146,6 +147,7 @@ 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); } @@ -159,7 +161,6 @@ public class WxCampaignController extends BaseController { WxCampaign wxCampaign = wxCampaignService.getById(id); if (wxCampaign != null) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); 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 9acc3b84b..98f71f117 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -57,10 +57,14 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "券投放-列表") - public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer type) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); - wxCoupon.updateTenantInfo(getTenantInfo()); + if(null != null && type == 1){ + wxCoupon.updateTenantInfo(ifParentUpdateTenantInfo()); + }else{ + wxCoupon.updateTenantInfo(getTenantInfo()); + } return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 347143745..782b0ed6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -61,7 +61,7 @@ public class AsyncTask { public void importExcelData(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 - params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值", "积分"}); + params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "成长值", "积分"}); IExcelDataHandler handler = new AsyncTask.UserExcelHandler(); handler.setNeedHandlerFields(new String[]{"手机号*"}); params.setNeedVerify(true);