diff --git a/mallinkAdmin/src/main/resources/db/migration/V202105290004__businessPermission.sql b/mallinkAdmin/src/main/resources/db/migration/V202105290004__businessPermission.sql index fab606add..8a3ca5c10 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202105290004__businessPermission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202105290004__businessPermission.sql @@ -10,11 +10,11 @@ update mall_sale_type set menus = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) -select CEILING(RAND()*90000000000+10000000000) ,tenant_id,parent_tenant_id,'',6,'{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}',now(),now() +select CEILING(RAND()*90000000000+10000000000) ,tenant_id,parent_tenant_id,'',50,'{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}',now(),now() from wx_mall where id != 1 and id != 10011 and id != 10071 and id != 10141 ; -INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`, `on_off`) VALUES (CEILING(RAND()*90000000000+10000000000), '1001', NULL, '', 6, '{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}', '2021-05-31 13:09:16', '2021-05-31 13:09:16', 0); -INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`, `on_off`) VALUES (CEILING(RAND()*90000000000+10000000000), '1007', NULL, '', 6, '{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}', '2021-05-31 13:09:16', '2021-05-31 13:09:16', 0); -INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`, `on_off`) VALUES (CEILING(RAND()*90000000000+10000000000), '1014', NULL, '', 6, '{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}', '2021-05-31 13:09:16', '2021-05-31 13:09:16', 0); +INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`, `on_off`) VALUES (CEILING(RAND()*90000000000+10000000000), '1001', NULL, '', 50, '{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}', '2021-05-31 13:09:16', '2021-05-31 13:09:16', 0); +INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`, `on_off`) VALUES (CEILING(RAND()*90000000000+10000000000), '1007', NULL, '', 50, '{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}', '2021-05-31 13:09:16', '2021-05-31 13:09:16', 0); +INSERT INTO `wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`, `on_off`) VALUES (CEILING(RAND()*90000000000+10000000000), '1014', NULL, '', 50, '{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}', '2021-05-31 13:09:16', '2021-05-31 13:09:16', 0); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index c92846728..54faf97c1 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -11,9 +11,13 @@ public enum EnumTemplateType { VERIFY_FAIL(2, "核销失败消息",""), // 小程序(作废) PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序(作废) + /** + * *******(4...99)留作模板消息 + * *******(4...49)留作全局推送 + */ ACTIVITY_REMIND(4, "活动开始提醒","386"), // 小程序 LIVE_REMIND(5, "直播开播提醒","8501"), // 小程序 - CREDIT_UPD_REMIND(6, "积分变更提醒","310"), // 小程序 + CREDIT_UPD_REMIND(50, "积分变更提醒","310"), // 小程序 AUDIT_MESSAGE(101, "公众号审核结果通知",""), // 公众号 VERIFY_RESULT(102, "公众号卡券核销通知",""), // 公众号 diff --git a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml index 438f995dc..957729308 100644 --- a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml @@ -71,7 +71,7 @@ from wx_template_msg - and `type` > 3 and `type` < 100 + and `type` > 3 and `type` < 50