From b82249b3c4a6cd859e815c1a51d7cec6051bfa77 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 21:58:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...l => V201905142010__CHANGE_PERMISSION.sql} | 53 +++++++++++-------- ...E.sql => V201905142144__ADD_SALE_TYPE.sql} | 4 +- 2 files changed, 33 insertions(+), 24 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201905071140__CHANGE_PERMISSION.sql => V201905142010__CHANGE_PERMISSION.sql} (88%) rename mallinkAdmin/src/main/resources/db/migration/{V201905071720__ADD_SALE_TYPE.sql => V201905142144__ADD_SALE_TYPE.sql} (63%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905071140__CHANGE_PERMISSION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905142010__CHANGE_PERMISSION.sql similarity index 88% rename from mallinkAdmin/src/main/resources/db/migration/V201905071140__CHANGE_PERMISSION.sql rename to mallinkAdmin/src/main/resources/db/migration/V201905142010__CHANGE_PERMISSION.sql index fb3de293f..3a6df7ae1 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201905071140__CHANGE_PERMISSION.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201905142010__CHANGE_PERMISSION.sql @@ -38,12 +38,13 @@ VALUES (106, '用户数据', 1, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-yonghushuju', 0, 106), (107, 'WIFI使用数据', 1, 'Y', null, 1, null, null, 'wifiuse', 'icon-wifi', 0, 107), + (201, '商铺管理', 2, 'Y', null, 0, null, null, null, 'icon-iconshangpuguanli', 0, 202), + (202, '商户管理', 2, 'Y', null, 0, null, null, null, 'icon-shanghuguanli', 0, 203), + (203, '商户解单', 2, 'Y', null, 1, null, null, 'jiedanList', 'icon-jine', 0, 204), + (204, '商户收银', 2, 'Y', null, 1, null, null, 'cashierList', 'icon-shouyintai', 0, 205), + (205, '品牌管理', 2, 'Y', null, 0, null, null, null, 'icon-pinpaiguanli', 0, 206), + (206, '租赁概览', 2, 'Y', null, 0, null, null, 'dataShoprental', 'icon-chuzu', 0, 201), - (201, '商铺管理', 2, 'Y', null, 0, null, null, null, 'icon-iconshangpuguanli', 0, 201), - (202, '商户管理', 2, 'Y', null, 0, null, null, null, 'icon-shanghuguanli', 0, 202), - (203, '商户解单', 2, 'Y', null, 1, null, null, 'jiedanList', 'icon-jine', 0, 203), - (204, '商户收银', 2, 'Y', null, 1, null, null, 'cashierList', 'icon-shouyintai', 0, 204), - (205, '品牌管理', 2, 'Y', null, 0, null, null, null, 'icon-pinpaiguanli', 0, 205), (211, '店铺', 201, 'Y', null, 1, null, null, 'shops', null, 0, 211), (212, '多经点位', 201, 'Y', null, 1, null, null, 'points', null, 0, 212), (221, '店铺商户', 202, 'Y', null, 1, null, null, 'merchant', null, 0, 221), @@ -55,17 +56,19 @@ VALUES (303, '多经点位租赁合同', 3, 'Y', null, 1, null, null, 'pointrentlist', 'icon-wuyehetong', 0, 303), (304, '多经点位物业合同', 3, 'Y', null, 1, null, null, 'pointtenementlist', 'icon-wuyehetong', 0, 304), - (401, '账单总览', 4, 'Y', null, 1, null, null, 'billlist', 'icon-bucaozulin', 0, 401), - (402, '商铺租赁账单', 4, 'Y', null, 1, null, null, 'zujinList', 'icon-zhangdan1', 0, 402), - (403, '商铺物业账单', 4, 'Y', null, 1, null, null, 'propertyList', 'icon-zhangdan1', 0, 403), - (404, '多经点位租赁账单', 4, 'Y', null, 1, null, null, 'pointzujinList', 'icon-taizhang', 0, 404), - (405, '多经点位物业账单', 4, 'Y', null, 1, null, null, 'pointpropertyList', 'icon-taizhang', 0, 405), - (406, '日常费用账单', 4, 'Y', null, 1, null, null, 'richangList', 'icon-richangfeiyongbaoxiao', 0, 406), - (407, '其他费用账单', 4, 'Y', null, 1, null, null, 'otherList', 'icon-qita', 0, 407), - (408, '其他押金账单', 4, 'Y', null, 1, null, null, 'otheryajinList', 'icon-yajin', 0, 408), - (409, '交易对账单', 4, 'Y', null, 1, null, null, 'dealbillList', 'icon-zhangdan11', 0, 409), - (410, '分账对账单', 4, 'Y', null, 1, null, null, 'sharingorderList', 'icon-zhangdan3', 0, 410), - (411, '营销补贴管理', 4, 'Y', null, 1, null, null, 'marketingList', 'icon-qian', 0, 411), + (401, '账单总览', 4, 'Y', null, 1, null, null, 'collectionRate', 'icon-feiyongshoujiao-', 0, 401), + (402, '商铺租赁账单', 4, 'Y', null, 1, null, null, 'zujinList', 'icon-wodezulinzhangdan', 0, 404), + (403, '商铺物业账单', 4, 'Y', null, 1, null, null, 'propertyList', 'icon-zhangdan1', 0, 405), + (404, '多经点位租赁账单', 4, 'Y', null, 1, null, null, 'pointzujinList', 'icon-taizhang', 0, 406), + (405, '多经点位物业账单', 4, 'Y', null, 1, null, null, 'pointpropertyList', 'icon-taizhang', 0, 407), + (406, '日常费用账单', 4, 'Y', null, 1, null, null, 'richangList', 'icon-richangfeiyongbaoxiao', 0, 408), + (407, '其他费用账单', 4, 'Y', null, 1, null, null, 'otherList', 'icon-qita', 0, 409), + (408, '其他押金账单', 4, 'Y', null, 1, null, null, 'otheryajinList', 'icon-yajin', 0, 410), + (409, '交易对账单', 4, 'Y', null, 1, null, null, 'dealbillList', 'icon-zhangdan11', 0, 411), + (410, '分账对账单', 4, 'Y', null, 1, null, null, 'sharingorderList', 'icon-zhangdan3', 0, 412), + (411, '营销补贴管理', 4, 'Y', null, 1, null, null, 'marketingList', 'icon-qian', 0, 413), + (412, '账单列表', 4, 'Y', null, 1, null, null, 'billlist', 'icon-bucaozulin', 0, 402), + (413, '商户账单', 4, 'Y', null, 1, null, null, 'collectionRateList', 'icon-bucaozulin', 0, 403), (501, '用户概览', 5, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-tubiaochicundaochuSVGshangchuandaoalibaba-', 0, 501), (502, '用户数量', 5, 'Y', null, 1, null, null, 'huiyuanShuliang', 'icon-yonghuguanli2', 0, 502), @@ -75,6 +78,7 @@ VALUES (506, '会员成长值', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 506), (507, '会员积分', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 507), (508, '积分商城', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 508), + (509, '停车会员', 5, 'Y', null, 0, null, null, 'parkingList', 'icon-tingchechang1', 0, 509), (511, '等级设置', 506, 'Y', null, 1, null, null, 'czdengji', null, 0, 511), (512, '规则设置', 506, 'Y', null, 1, null, null, 'czguize', null, 0, 512), (513, '会员权益', 506, 'Y', null, 1, null, null, 'interestsMembers', null, 0, 513), @@ -96,18 +100,23 @@ VALUES (609, '精准投放', 6, 'Y', null, 0, null, null, null, 'icon-jingzhuntoufang', 0, 609), (610, '订单管理', 6, 'Y', null, 0, null, null, 'orderList', 'icon-dingdanguanli', 0, 610), (611, '疲劳度设置', 6, 'Y', null, 1, null, null, 'pilaodu', 'icon-pilaojiashi', 0, 611), - (621, '卡营销数据', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 621), - (622, '劵营销数据', 601, 'Y', null, 1, null, null, 'couponSellData', null, 0, 622), - (623, '砍价营销数据', 601, 'Y', null, 1, null, null, 'bargainSellData', null, 0, 623), - (624, '拼团营销数据', 601, 'Y', null, 1, null, null, 'groupSellData', null, 0, 624), - (625, '触达用户数', 601, 'Y', null, 1, null, null, 'chuda', null, 0, 625), - (626, '场景营销数据', 601, 'Y', null, 1, null, null, 'changjing', null, 0, 531), + + (621, '卡营销数据', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 622), + (622, '劵营销数据', 601, 'Y', null, 1, null, null, 'couponSellData', null, 0, 623), + (623, '砍价营销数据', 601, 'Y', null, 1, null, null, 'bargainSellData', null, 0, 624), + (624, '拼团营销数据', 601, 'Y', null, 1, null, null, 'groupSellData', null, 0, 625), + (625, '触达用户数', 601, 'Y', null, 1, null, null, 'chuda', null, 0, 626), + (626, '场景营销数据', 601, 'Y', null, 1, null, null, 'changjing', null, 0, 627), + (627, '营销分析', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 621), + (641, '通用券', 602, 'Y', null, 1, null, null, 'tongyong', null, 0, 641), (642, '满减券', 602, 'Y', null, 1, null, null, 'manjian', null, 0, 642), (643, '代金券', 602, 'Y', null, 1, null, null, 'daijin', null, 0, 643), (644, '礼品券', 602, 'Y', null, 1, null, null, 'lipin', null, 0, 644), (645, '停车券', 602, 'Y', null, 1, null, null, 'tingche', null, 0, 645), + (651, '消费卡', 603, 'Y', null, 1, null, null, 'introducing', null, 0, 651), + (661, '砍价', 604, 'Y', null, 1, null, null, 'bargain', null, 0, 661), (662, '拼团', 604, 'Y', null, 1, null, null, 'spellgroup', null, 0, 662), diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905071720__ADD_SALE_TYPE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905142144__ADD_SALE_TYPE.sql similarity index 63% rename from mallinkAdmin/src/main/resources/db/migration/V201905071720__ADD_SALE_TYPE.sql rename to mallinkAdmin/src/main/resources/db/migration/V201905142144__ADD_SALE_TYPE.sql index 033663fa4..a3a50f02c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201905071720__ADD_SALE_TYPE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201905142144__ADD_SALE_TYPE.sql @@ -13,10 +13,10 @@ INSERT INTO `mall_sale_type` (`id`,`name`, `type`, `period`, `menus`) VALUES (1, '尊享全能版', 1, 12, - '[1,2,3,4,5,6,7,8,9,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,621,622,623,624,625,626,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' + '[1,2,3,4,5,6,7,8,9,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' ), (2, '尊享营销版', 2, 12, - '[1,2,4,5,6,101,103,104,105,106,201,202,205,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,621,622,623,624,625,626,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]' + '[1,2,4,5,6,101,102,103,104,105,106,107,201,202,203,204,205,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' ), (3, '速享版', 3, 1, '[2,4,5,6,201,202,205,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,621,622,623,624,625,626,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]'