From 07d9efc2c3d54b23b1c25ea35d807710a5aeedad Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Aug 2020 10:54:07 +0800 Subject: [PATCH 1/2] campaign --- .../iformall/controller/market/WxCampaignController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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..384e8196b 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(ifParentUpdateTenantInfo()); 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(ifParentUpdateTenantInfo()); wxCampaignService.addForPath(wxCampaign); return new ResultData(); } @@ -159,7 +159,7 @@ public class WxCampaignController extends BaseController { WxCampaign wxCampaign = wxCampaignService.getById(id); if (wxCampaign != null) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.updateTenantInfo(getTenantInfo()); + wxCouponChannel.updateTenantInfo(ifParentUpdateTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); From 3d8f4fda1edec2d4b49a9fe68b011975900a3cba Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Aug 2020 10:59:23 +0800 Subject: [PATCH 2/2] campaign sql --- .../resources/db/migration/V202007311142__GROUP__ADD_002.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql index 635e2da0f..d39a90901 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql @@ -1,4 +1,4 @@ -update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100 +update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 605, 621, 622, 623, 624, 625, 626, 627, 671, 901, 902]' where id=100 CREATE DEFINER=`root`@`%` PROCEDURE `init_after_group`(IN tenantId VARCHAR(25),IN subTenantIds VARCHAR(250))