diff --git a/mallinkAdmin/src/main/resources/db/migration/V201903291803__ADD_USER_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201903291803__ADD_USER_ACTION.sql deleted file mode 100644 index 51b5d4f5b..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201903291803__ADD_USER_ACTION.sql +++ /dev/null @@ -1,12 +0,0 @@ -DROP TABLE IF EXISTS `mall_user_action` ; -CREATE TABLE `mall_user_action` ( - `id` bigint(64) NOT NULL, - `tenant_id` varchar(50) NOT NULL, - `user_id` bigint(64) NOT NULL COMMENT 'mall_user_id', - `type` smallint(2) NOT NULL COMMENT '类型 0-controller, 1-service', - `ip` varchar(25) NOT NULL, - `action_desc` varchar(200) NOT NULL COMMENT '功能描述', - `action_time` datetime NOT NULL COMMENT '访问时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='用户操作记录' CHECKSUM=0 DELAY_KEY_WRITE=0; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201903300958__CHANGE_USER_LEN.sql b/mallinkAdmin/src/main/resources/db/migration/V201903300958__CHANGE_USER_LEN.sql deleted file mode 100644 index e41e6f51d..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201903300958__CHANGE_USER_LEN.sql +++ /dev/null @@ -1,19 +0,0 @@ -ALTER TABLE `wx_c_user` -ADD COLUMN `open_app_id` VARCHAR(18) NULL AFTER `update_date`, -ADD COLUMN `mp_open_id` VARCHAR(28) NULL AFTER `open_app_id`, -ADD COLUMN `mp_app_id` VARCHAR(18) NULL AFTER `mp_open_id`, -ADD COLUMN `mp_subscribe` TINYINT(2) NULL AFTER `mp_app_id`, -ADD COLUMN `mp_subscribe_time` datetime NULL AFTER `mp_subscribe`, -ADD COLUMN `mp_subscribe_scene` VARCHAR(20) NULL AFTER `mp_subscribe_time`, -ADD COLUMN `subs_open_id` VARCHAR(28) NULL AFTER `mp_subscribe_scene`, -ADD COLUMN `subs_app_id` VARCHAR(18) NULL AFTER `subs_open_id`, -ADD COLUMN `subs_subscribe` TINYINT(2) NULL AFTER `subs_app_id`, -ADD COLUMN `subs_subscribe_time` datetime NULL AFTER `subs_subscribe`, -ADD COLUMN `subs_subscribe_scene` VARCHAR(20) NULL AFTER `subs_subscribe_time`, -CHANGE COLUMN `open_id` `open_id` VARCHAR(28) NOT NULL COMMENT '微信openId' , -CHANGE COLUMN `union_id` `union_id` VARCHAR(29) NULL DEFAULT NULL COMMENT '微信unionId' , -CHANGE COLUMN `phone` `phone` VARCHAR(20) NULL DEFAULT NULL COMMENT '用户绑定的手机号' , -CHANGE COLUMN `register_ip` `register_ip` VARCHAR(20) NULL DEFAULT NULL COMMENT '用户注册IP' , -CHANGE COLUMN `app_id` `app_id` VARCHAR(20) NULL DEFAULT NULL COMMENT '小程序的appId' , -CHANGE COLUMN `latitude` `latitude` DECIMAL(10,5) NULL DEFAULT NULL COMMENT '维度' , -CHANGE COLUMN `longitude` `longitude` DECIMAL(10,5) NULL DEFAULT NULL COMMENT '经度' ; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904011301__ADD_PAYACCOUNTBILLINFO.sql b/mallinkAdmin/src/main/resources/db/migration/V201904011301__ADD_PAYACCOUNTBILLINFO.sql deleted file mode 100644 index c8321c7f0..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904011301__ADD_PAYACCOUNTBILLINFO.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE `wx_pay_account_bill` -ADD COLUMN `bank_account_name` VARCHAR(50) NULL COMMENT '银行账户名' AFTER `rate`, -ADD COLUMN `bank_card_id` VARCHAR(50) NULL COMMENT '银行卡号' AFTER `bank_account_name`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904011435__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904011435__ADD_FLOW.sql deleted file mode 100644 index edd1c8e3d..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904011435__ADD_FLOW.sql +++ /dev/null @@ -1,22 +0,0 @@ -ALTER TABLE `wx_bill_rent` -ADD COLUMN `apply_status` SMALLINT(1) DEFAULT 1 COMMENT '审核状态0未审核1审核中2审核完成3驳回4合同作废5撤回' AFTER `is_preview`; - -ALTER TABLE `wx_bill_property` -ADD COLUMN `apply_status` SMALLINT(1) DEFAULT 1 COMMENT '审核状态0未审核1审核中2审核完成3驳回4合同作废5撤回' AFTER `is_preview`; - -ALTER TABLE `wx_bill_daily` -ADD COLUMN `apply_status` SMALLINT(1) DEFAULT 1 COMMENT '审核状态0未审核1审核中2审核完成3驳回4合同作废5撤回'; - -ALTER TABLE `wx_bill_other` -ADD COLUMN `apply_status` SMALLINT(1) DEFAULT 1 COMMENT '审核状态0未审核1审核中2审核完成3驳回4合同作废5撤回'; - -alter table wx_msg_model modify column content text; - -ALTER TABLE `wx_shop` -ADD COLUMN `email` varchar(100) DEFAULT NULL COMMENT '邮箱'; - -ALTER TABLE `mall_user_info` -ADD COLUMN `email` varchar(100) DEFAULT NULL COMMENT '邮箱'; - -ALTER TABLE `wx_merchant` -ADD COLUMN `email` varchar(100) DEFAULT NULL COMMENT '邮箱'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904011538__CHANGE_MALL_COVER.sql b/mallinkAdmin/src/main/resources/db/migration/V201904011538__CHANGE_MALL_COVER.sql deleted file mode 100644 index df1066753..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904011538__CHANGE_MALL_COVER.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE `wx_mall` -ADD COLUMN `weapp_share_title` VARCHAR (20) NULL COMMENT '分享标题' AFTER `img_qrcode_wemp`, -ADD COLUMN `weapp_share_cover_img` VARCHAR (100) NULL COMMENT '分享封面图片' AFTER `weapp_share_title`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904012109__ADD_RENT_FILES.sql b/mallinkAdmin/src/main/resources/db/migration/V201904012109__ADD_RENT_FILES.sql deleted file mode 100644 index c3851a5a3..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904012109__ADD_RENT_FILES.sql +++ /dev/null @@ -1,19 +0,0 @@ -ALTER TABLE `wx_rent_contract` -ADD COLUMN `file_names` JSON NULL COMMENT '合同支持多文件' AFTER `fix_end_date`; - -update wx_rent_contract set file_names=CONCAT('[{\"filename\":\"',`filename`,'\",\"filepath\":\"',`filepath`,'\"}]') -where filename is not null or LENGTH(`filename`) >0; - -update wx_rent_contract set file_names=CONCAT('[]') where filename is null or LENGTH(`filename`)=0 ; - - -ALTER TABLE `wx_property_contract` -ADD COLUMN `file_names` JSON NULL COMMENT '合同支持多文件'; - -update wx_property_contract set file_names=CONCAT('[{\"filename\":\"',`filename`,'\",\"filepath\":\"',`filepath`,'\"}]') -where filename is not null or LENGTH(`filename`) >0; - -update wx_property_contract set file_names=CONCAT('[]') where filename is null or LENGTH(`filename`)=0 ; - - - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904021540__ADD_RENT_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904021540__ADD_RENT_BILL.sql deleted file mode 100644 index b7a97cffd..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904021540__ADD_RENT_BILL.sql +++ /dev/null @@ -1,17 +0,0 @@ -ALTER TABLE `wx_rent_contract` -ADD COLUMN `rent_info` JSON NULL COMMENT '商铺信息'; - -ALTER TABLE `wx_property_contract` -ADD COLUMN `rent_info` JSON NULL COMMENT '商铺信息'; - -ALTER TABLE `wx_bill_rent` -ADD COLUMN `shop_info` JSON NULL COMMENT '商铺信息'; - -ALTER TABLE `wx_bill_rent_deposit` -ADD COLUMN `shop_info` JSON NULL COMMENT '商铺信息'; - -ALTER TABLE `wx_bill_property` -ADD COLUMN `shop_info` JSON NULL COMMENT '商铺信息'; - -ALTER TABLE `wx_bill_property_deposit` -ADD COLUMN `shop_info` JSON NULL COMMENT '商铺信息'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904021550__ADD_WX_CREDIT_HISTORY.sql b/mallinkAdmin/src/main/resources/db/migration/V201904021550__ADD_WX_CREDIT_HISTORY.sql deleted file mode 100644 index 244d1e6db..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904021550__ADD_WX_CREDIT_HISTORY.sql +++ /dev/null @@ -1,18 +0,0 @@ -DROP TABLE IF EXISTS `wx_credit_history`; -CREATE TABLE `wx_credit_history` ( - `id` bigint(64) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(50) NOT NULL COMMENT '租户ID', - `c_user_id` bigint(64) NOT NULL COMMENT '用户ID', - `credit_amount` int(11) NOT NULL COMMENT '总积分', - `credit_num` int(11) NOT NULL COMMENT '每笔积分明细', - `credit_type` tinyint(2) NOT NULL COMMENT '积分类型(操作说明)', - `create_date` datetime(0) NOT NULL COMMENT '创建日期', - `receipt_url` varchar(256) NULL DEFAULT NULL COMMENT '小票URL', - `operator_type` tinyint(2) NOT NULL COMMENT '操作人类型', - `operator_id` bigint(64) NOT NULL COMMENT '操作人ID', - `merchant_id` bigint(11) NULL DEFAULT NULL COMMENT '商户ID', - `coupon_id` bigint(64) NULL DEFAULT NULL COMMENT '券ID(积分兑换券时生成)', - `business_id` bigint(64) NULL DEFAULT NULL COMMENT '业态ID(计算新增积分时使用)', - `spend` int(11) NULL DEFAULT NULL COMMENT '花费', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB ROW_FORMAT = Dynamic COMMENT='积分记录'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904031030__UPDATE_WX_SHOP.sql b/mallinkAdmin/src/main/resources/db/migration/V201904031030__UPDATE_WX_SHOP.sql deleted file mode 100644 index 3ed494ce0..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904031030__UPDATE_WX_SHOP.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_shop` -ADD COLUMN `is_del` smallint(2) DEFAULT 0 COMMENT '是否删除1是0否'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904031540__ADD_BILL_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201904031540__ADD_BILL_ACTION.sql deleted file mode 100644 index 978192cbf..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904031540__ADD_BILL_ACTION.sql +++ /dev/null @@ -1,14 +0,0 @@ -DROP TABLE IF EXISTS `wx_bill_action` ; -CREATE TABLE `wx_bill_action` ( - `id` bigint(64) NOT NULL COMMENT 'ID', - `tenant_id` varchar(50) NOT NULL COMMENT '租户Id', - `user_id` bigint(64) NOT NULL COMMENT '用户ID', - `user_name` varchar(100) NOT NULL COMMENT '用户名', - `phone` varchar(20) NOT NULL COMMENT '手机号', - `action` smallint(2) NOT NULL COMMENT '动作', - `details` varchar(200) NOT NULL COMMENT '明细', - `createtime` datetime NOT NULL COMMENT '创建时间', - `updatetime` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='账单操作记录' CHECKSUM=0 DELAY_KEY_WRITE=0; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904091440__ADD_FORMID_FOR_ORDER.sql b/mallinkAdmin/src/main/resources/db/migration/V201904091440__ADD_FORMID_FOR_ORDER.sql deleted file mode 100644 index 0599a5d3d..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904091440__ADD_FORMID_FOR_ORDER.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_order` -ADD COLUMN `form_id` VARCHAR(64) NULL COMMENT 'formId' AFTER `order_group_id`; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904101129__ADD_TABLE_SUB_BUSINESS.sql b/mallinkAdmin/src/main/resources/db/migration/V201904101129__ADD_TABLE_SUB_BUSINESS.sql deleted file mode 100644 index 8e20b30a0..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904101129__ADD_TABLE_SUB_BUSINESS.sql +++ /dev/null @@ -1,21 +0,0 @@ --- ---------------------------- --- Table structure for `wx_sub_business` --- ---------------------------- -DROP TABLE IF EXISTS `wx_sub_business`; -CREATE TABLE `wx_sub_business` ( - `id` int(11) NOT NULL, - `title` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, - `business_id` int(11) NOT NULL, - `business_title` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, - `create_date` datetime DEFAULT CURRENT_TIMESTAMP, - `update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- ---------------------------- --- Records of `wx_sub_business` --- ---------------------------- -BEGIN; -INSERT INTO `wx_sub_business` VALUES ('1', '西餐', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('2', '日本料理', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('3', '韩国料理', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('4', '东南亚菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('5', '自助餐', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('6', '火锅', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('7', '特色菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('8', '私房菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('9', '素食', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('10', '烧烤', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('11', '小吃快餐', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('12', '川菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('13', '湘菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('14', '鲁菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('15', '粤菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('16', '湖北菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('17', '云贵菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('18', '东北菜', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('19', '面包店', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('20', '咖啡厅', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('21', '饮品店', '1', '餐饮', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('22', '男装', '3', '服饰', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('23', '女装', '3', '服饰', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('24', '童装', '3', '服饰', '2019-04-09 17:09:07', '2019-04-09 17:09:07'), ('25', '鞋帽', '3', '服饰', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('26', '配饰', '3', '服饰', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('27', '内衣', '3', '服饰', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('28', '亲子摄影', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('29', '亲子游乐', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('30', '幼儿教育', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('31', '孕产护理', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('32', '童车童床', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('33', '玩具', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('34', '喂养用品', '4', '亲子', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('35', '面部护肤', '7', '美妆', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('36', '香水彩妆', '7', '美妆', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('37', '男士护肤', '7', '美妆', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('38', '营养保健', '7', '美妆', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('39', '黄金', '8', '珠宝', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('40', '钻石', '8', '珠宝', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('41', '时尚饰品', '8', '珠宝', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('42', '翡翠玉石', '8', '珠宝', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('43', '钟表', '8', '珠宝', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('44', 'KTV', '2', '娱乐', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('45', '轰趴馆', '2', '娱乐', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('46', 'DIY手工', '2', '娱乐', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('47', '文化艺术', '2', '娱乐', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('48', '游艺娱乐', '2', '娱乐', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('49', '桌游', '2', '娱乐', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('50', '运动健身', '9', '服务', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('51', '婚纱摄影', '9', '服务', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('52', '美容美发', '9', '服务', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('53', '学习培训', '9', '服务', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('54', '家具', '10', '家居', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('55', '家饰', '10', '家居', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('56', '家纺', '10', '家居', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('57', '生活用品', '10', '家居', '2019-04-09 17:09:08', '2019-04-09 17:09:08'), ('58', '厨具', '10', '家居', '2019-04-09 17:09:08', '2019-04-09 17:09:08'); -COMMIT; - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904101310__UPDATE_COUPON_SEND.sql b/mallinkAdmin/src/main/resources/db/migration/V201904101310__UPDATE_COUPON_SEND.sql deleted file mode 100644 index ee943b34a..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904101310__UPDATE_COUPON_SEND.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_coupon_send` -ADD COLUMN `send_sms` smallint(2) default 0 COMMENT '是否发送短信1是0否'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904101312__ADD_SUB_BUSINESS_COLUMN.sql b/mallinkAdmin/src/main/resources/db/migration/V201904101312__ADD_SUB_BUSINESS_COLUMN.sql deleted file mode 100644 index 70ba788ef..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904101312__ADD_SUB_BUSINESS_COLUMN.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE `wx_coupon` -ADD COLUMN `sub_business` INT(11) NULL DEFAULT NULL AFTER `business`; -ALTER TABLE `wx_coupon_channel` -ADD COLUMN `sub_business` INT(11) NULL DEFAULT NULL AFTER `business`; -ALTER TABLE `wx_merchant` -ADD COLUMN `sub_business_id` INT(11) NULL DEFAULT NULL AFTER `business_id`; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904111308__CHANGE_C_USER_INFOS.sql b/mallinkAdmin/src/main/resources/db/migration/V201904111308__CHANGE_C_USER_INFOS.sql deleted file mode 100644 index 8e44b1dc0..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904111308__CHANGE_C_USER_INFOS.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `wx_c_user` -CHANGE COLUMN `mp_subscribe_scene` `mp_subscribe_scene` VARCHAR(30) NULL, -CHANGE COLUMN `subs_subscribe_scene` `subs_subscribe_scene` VARCHAR(30) NULL, -CHANGE COLUMN `open_id` `open_id` VARCHAR(28) NULL COMMENT '微信openId'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904111545__UPDATE_BILL_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201904111545__UPDATE_BILL_TABLE.sql deleted file mode 100644 index 082b3a9f4..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904111545__UPDATE_BILL_TABLE.sql +++ /dev/null @@ -1,14 +0,0 @@ -ALTER TABLE `wx_bill_rent` -ADD COLUMN `pay_way` smallint (2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; -ALTER TABLE `wx_bill_rent_deposit` -ADD COLUMN `pay_way` smallint(2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; -ALTER TABLE `wx_bill_property` -ADD COLUMN `pay_way` smallint(2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; -ALTER TABLE `wx_bill_property_deposit` -ADD COLUMN `pay_way` smallint (2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; -ALTER TABLE `wx_bill_other` -ADD COLUMN `pay_way` smallint(2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; -ALTER TABLE `wx_bill_other_deposit` -ADD COLUMN `pay_way` smallint(2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; -ALTER TABLE `wx_bill_daily` -ADD COLUMN `pay_way` smallint(2) NULL DEFAULT NULL COMMENT '支付方式1现金2支付宝3微信4银行卡转账-1其他'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904121411__UPDATE_BUSINESS_TAGS.sql b/mallinkAdmin/src/main/resources/db/migration/V201904121411__UPDATE_BUSINESS_TAGS.sql deleted file mode 100644 index 918f32ad6..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904121411__UPDATE_BUSINESS_TAGS.sql +++ /dev/null @@ -1,48 +0,0 @@ -UPDATE `wx_tags` SET `name` = '餐饮' WHERE (`id` = '68'); -UPDATE `wx_tags` SET `name` = '娱乐' WHERE (`id` = '69'); -UPDATE `wx_tags` SET `name` = '服饰' WHERE (`id` = '70'); -UPDATE `wx_tags` SET `name` = '亲子' WHERE (`id` = '71'); -UPDATE `wx_tags` SET `name` = '超市' WHERE (`id` = '72'); -UPDATE `wx_tags` SET `name` = '美妆' WHERE (`id` = '73'); -UPDATE `wx_tags` SET `name` = '珠宝' WHERE (`id` = '74'); -UPDATE `wx_tags` SET `name` = '服务' WHERE (`id` = '75'); -UPDATE `wx_tags` SET `name` = '家居' WHERE (`id` = '76'); - -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('129', '火锅', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('130', '特色菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('131', '私房菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('132', '素食', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('133', '烧烤', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('134', '小吃快餐', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('135', '川菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('136', '湘菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('137', '鲁菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('138', '粤菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('139', '湖北菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('140', '云贵菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('141', '东北菜', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('142', '面包店', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('143', '咖啡厅', '3', '消费偏好', '17', '饮食偏好'); -INSERT INTO `wx_tags` (`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES ('144', '饮品店', '3', '消费偏好', '17', '饮食偏好'); - -UPDATE `wx_tags` SET `name` = '西餐' WHERE (`id` = '92'); -UPDATE `wx_tags` SET `name` = '日本料理' WHERE (`id` = '93'); -UPDATE `wx_tags` SET `name` = '韩国料理' WHERE (`id` = '94'); -UPDATE `wx_tags` SET `name` = '东南亚菜' WHERE (`id` = '95'); -UPDATE `wx_tags` SET `name` = '自助餐' WHERE (`id` = '96'); - -update wx_c_user_tags set tags = replace(tags, '92', '132') where JSON_CONTAINS(tags, '[92]'); -update wx_c_user_tags set tags = replace(tags, '93', '134') where JSON_CONTAINS(tags, '[92]'); -update wx_c_user_tags set tags = replace(tags, '96', '129') where JSON_CONTAINS(tags, '[92]'); -update wx_c_user_tags set tags = replace(tags, '94', '92') where JSON_CONTAINS(tags, '[92]'); -update wx_c_user_tags set tags = replace(tags, '95', '93') where JSON_CONTAINS(tags, '[92]'); - - -UPDATE `wx_question` SET `content` = '{\"flag\":\"multi\",\"title\":\"请问您喜欢哪种口味的食物?\",\"answers\":[{\"id\":\"92\",\"name\":\"西餐\"},{\"id\":\"93\",\"name\":\"日本料理\"},{\"id\":\"94\",\"name\":\"韩国料理\"},{\"id\":\"95\",\"name\":\"东南亚菜\"},{\"id\":\"96\",\"name\":\"自助餐\"},{\"id\":\"129\",\"name\":\"火锅\"},{\"id\":\"130\",\"name\":\"特色菜\"},{\"id\":\"131\",\"name\":\"私房菜\"},{\"id\":\"132\",\"name\":\"素食\"},{\"id\":\"133\",\"name\":\"烧烤\"},{\"id\":\"134\",\"name\":\"小吃快餐\"},{\"id\":\"135\",\"name\":\"川菜\"},{\"id\":\"136\",\"name\":\"湘菜\"},{\"id\":\"137\",\"name\":\"鲁菜\"},{\"id\":\"138\",\"name\":\"粤菜\"},{\"id\":\"139\",\"name\":\"湖北菜\"},{\"id\":\"140\",\"name\":\"云贵菜\"},{\"id\":\"141\",\"name\":\"东北菜\"},{\"id\":\"142\",\"name\":\"面包店\"},{\"id\":\"143\",\"name\":\"咖啡厅\"},{\"id\":\"144\",\"name\":\"饮品店\"}]}' -WHERE content -> '$.title' = '请问您喜欢哪种口味的食物?'; - -update wx_question_log set answer = replace(answer, '92', '132') where JSON_CONTAINS(answer, '[92]'); -update wx_question_log set answer = replace(answer, '93', '134') where JSON_CONTAINS(answer, '[93]'); -update wx_question_log set answer = replace(answer, '96', '129') where JSON_CONTAINS(answer, '[96]'); -update wx_question_log set answer = replace(answer, '94', '92') where JSON_CONTAINS(answer, '[94]'); -update wx_question_log set answer = replace(answer, '95', '93') where JSON_CONTAINS(answer, '[95]'); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql deleted file mode 100644 index 403ced5d2..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table wx_bill_rent -add column `late_pay_status` smallint(2) default 2 COMMENT '滞纳金状态(使用账单的状态)'; - -alter table wx_bill_property -add column `late_pay_status` smallint(2) default 2 COMMENT '滞纳金状态(使用账单的状态)'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904161130__UPDATE_BILL_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201904161130__UPDATE_BILL_ACTION.sql deleted file mode 100644 index 3ad96bcec..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904161130__UPDATE_BILL_ACTION.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table wx_bill_action -add column `bill_id` bigint(64) default null COMMENT '账单ID'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904171140__UPDATE_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904171140__UPDATE_MERCHANT.sql deleted file mode 100644 index e0d07588e..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904171140__UPDATE_MERCHANT.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table wx_merchant -add column `title` varchar(255) default '' COMMENT '副标题', -add column `cover_picture` json default null COMMENT '封面图'; - -update wx_merchant set cover_picture=json_array(img_url); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904171524__INSERT_SMARTHARDWARE_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201904171524__INSERT_SMARTHARDWARE_MENU.sql deleted file mode 100644 index 96a28d434..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904171524__INSERT_SMARTHARDWARE_MENU.sql +++ /dev/null @@ -1 +0,0 @@ -insert into `mall_permission` ( `sort`, `id`, `available`, `resource_type`, `name`) values ( '9', '9', 'Y', '0', '智能硬件'); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904180909__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904180909__ADD_FLOW.sql deleted file mode 100644 index daee928c2..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904180909__ADD_FLOW.sql +++ /dev/null @@ -1,3 +0,0 @@ - - -alter table `wx_msg_record` modify column status_message text; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904181120__ADD_TAGS_COLUMN.sql b/mallinkAdmin/src/main/resources/db/migration/V201904181120__ADD_TAGS_COLUMN.sql deleted file mode 100644 index 7df208477..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904181120__ADD_TAGS_COLUMN.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_msg` -ADD COLUMN `tags` JSON NULL DEFAULT NULL AFTER `label`; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904181710__UPDATE_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904181710__UPDATE_MERCHANT.sql deleted file mode 100644 index 15885cbc5..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904181710__UPDATE_MERCHANT.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table wx_merchant -add column `bill_setting` int(10) default 3 COMMENT '待缴提醒'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql deleted file mode 100644 index e594341b3..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904191333__ADD_FLOW.sql +++ /dev/null @@ -1,5 +0,0 @@ - - - -ALTER TABLE `wx_flow_record` -ADD COLUMN `start_date` DATETIME COMMENT '发起时间'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql deleted file mode 100644 index 988d6fa94..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql +++ /dev/null @@ -1,6 +0,0 @@ - - - -update wx_flow_record f set f.start_date = -FROM_UNIXTIME((select text_ from ACT_HI_VARINST where name_='startTime' and PROC_INST_ID_ = f.`process_instance_id`)/1000,'%Y-%m-%d %H:%i:%S') -where f.start_date is null diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904191440__UPDATE_BILL_DAILY.sql b/mallinkAdmin/src/main/resources/db/migration/V201904191440__UPDATE_BILL_DAILY.sql deleted file mode 100644 index cf62ea2bf..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904191440__UPDATE_BILL_DAILY.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table wx_bill_daily -add column `price_detail` json default null COMMENT '费用明细'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904201830__UPDATE_BILL_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201904201830__UPDATE_BILL_DATA.sql deleted file mode 100644 index 6bb37cc8d..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904201830__UPDATE_BILL_DATA.sql +++ /dev/null @@ -1,7 +0,0 @@ -update wx_bill_rent set pay_way=-1; -update wx_bill_rent_deposit set pay_way=-1; -update wx_bill_property set pay_way=-1; -update wx_bill_property_deposit set pay_way=-1; -update wx_bill_daily set pay_way=-1; -update wx_bill_other set pay_way=-1; -update wx_bill_other_deposit set pay_way=-1; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221747__ADD_FLOW_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221747__ADD_FLOW_MSG_MODEL.sql deleted file mode 100644 index b524daa43..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904221747__ADD_FLOW_MSG_MODEL.sql +++ /dev/null @@ -1,8 +0,0 @@ -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`) -VALUES - (205925981009271111, '789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的合同已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1), - (205925981009271112, '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2), - (205925981009271113, '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的合同审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3), - (205925981009271114, '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4), - (205925981009271115, '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个合同待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5), - (205925981009271116, '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的合同合同审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221823__UPDATE_USER_CREDIT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221823__UPDATE_USER_CREDIT.sql deleted file mode 100644 index 4dd056e36..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904221823__UPDATE_USER_CREDIT.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table wx_c_user add credit int(11); -alter table wx_c_user_basic_info add credit int(11); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221912__ADD_COUPON_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221912__ADD_COUPON_MERCHANT.sql deleted file mode 100644 index 5e3ddd387..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904221912__ADD_COUPON_MERCHANT.sql +++ /dev/null @@ -1,3 +0,0 @@ -alter table wx_merchant add is_admin smallint(2); -alter table wx_coupon add credit_price int(11); -alter table wx_coupon add credit_refund smallint(2); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904221915__UPDATE_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904221915__UPDATE_CONTRACT.sql deleted file mode 100644 index 1479c7c44..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904221915__UPDATE_CONTRACT.sql +++ /dev/null @@ -1,96 +0,0 @@ -DELIMITER $$ -DROP PROCEDURE IF EXISTS `contract_update`$$ -CREATE PROCEDURE `contract_update`() -LANGUAGE SQL -NOT DETERMINISTIC -CONTAINS SQL -SQL SECURITY DEFINER -COMMENT '' -begin - #定义一个循环结束的标记 - declare done int default false; - #定义一个循环总条数 - declare total int; - #定义一个循环开始值 - declare i int; - #定义商铺相关字段 - declare _shop_id bigint(64); - declare _shop_number varchar(100); - declare _build_area varchar(100); - declare _operation_area varchar(100); - declare _floor varchar(100); - declare _img_url varchar(1024); - declare _addr varchar(100); - declare _type smallint(2); - declare _status smallint(2); - declare _manager varchar(100); - declare _manager_phone varchar(100); - declare _building varchar(100); - #租赁合同相关信息 - declare _rent_id bigint(64); - declare _rent_area varchar(100); - declare _adjust_ratio json; - declare _price decimal(10,2); - declare _deposit decimal(10,2); - - declare _adjust_ratio_new json; - declare _adjust_ratio_value decimal(10,2); - - - declare rent_cursor cursor for select id,shop_id from wx_rent_contract where rent_shop_type=1; - declare rent_total_cursor cursor for select count(*) total from wx_rent_contract where rent_shop_type=1; - declare continue handler for not found set done = true; - - set i=1; - open rent_cursor; - open rent_total_cursor; - fetch rent_cursor into _rent_id,_shop_id; - fetch rent_total_cursor into total; - repeat - if not done then - #查询商铺信息 - select s.shop_number,s.build_area,s.img_url,s.operation_area,s.status,b.building_name,f.floor_name, - s.manager,s.manager_phone,type,s.addr - into _shop_number,_build_area,_img_url,_operation_area,_status,_building,_floor,_manager,_manager_phone,_type,_addr - from wx_shop s left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id - where s.id=_shop_id; - #查询合同信息 - select rent_area,adjust_ratio,truncate(price/100,2),truncate(deposit/100,2) into _rent_area,_adjust_ratio,_price,_deposit - from wx_rent_contract where id=_rent_id; - #解析年调整比例 - set @j=0; - set _adjust_ratio_new = json_array(); - while (select json_length(_adjust_ratio))>0 and @j<>(select json_length(_adjust_ratio)) do - set @ratio_index=concat("$[",@j,"]"); - select truncate(json_extract(_adjust_ratio,@ratio_index)/100,2) into _adjust_ratio_value; - select json_array_insert(_adjust_ratio_new,@ratio_index,_adjust_ratio_value) into _adjust_ratio_new; - set @j=@j+1; - end while; - #更新租赁合同信息 - update wx_rent_contract set rent_info=json_array(JSON_OBJECT('shopId',_shop_id,'id',_shop_id,'shopNumber',_shop_number, - 'price',_price,'deposit',_deposit,'adjustRatio',_adjust_ratio_new,'addr',_addr,'buildArea',_build_area,'imgUrl',_img_url, - 'operationArea',_operation_area,'building',_building,'floor',_floor,'manager',_manager,'managerPhone',_manager_phone, - 'type',_type,'status',_status,'rentArea',_rent_area)) - where id=_rent_id; - #更新物业信息 - update wx_property_contract set rent_info=json_array(JSON_OBJECT('shopId',_shop_id,'id',_shop_id,'shopNumber',_shop_number, - 'price',_price,'deposit',_deposit,'adjustRatio',_adjust_ratio_new,'addr',_addr,'buildArea',_build_area,'imgUrl',_img_url, - 'operationArea',_operation_area,'building',_building,'floor',_floor,'manager',_manager,'managerPhone',_manager_phone, - 'type',_type,'status',_status,'rentArea',_rent_area)) - where rent_contract_id=_rent_id; - fetch rent_cursor into _rent_id,_shop_id; - end if; - IF i<>total then - set done =false; - set i=i+1; - else - set done = true; - end if; - until done - end repeat; - close rent_cursor; - close rent_total_cursor; - -end $$ -DELIMITER ; -### call contract_update(); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904222037__ADD_CREDIT_CHANGE_PURPOSE.sql b/mallinkAdmin/src/main/resources/db/migration/V201904222037__ADD_CREDIT_CHANGE_PURPOSE.sql deleted file mode 100644 index e6ccc313f..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904222037__ADD_CREDIT_CHANGE_PURPOSE.sql +++ /dev/null @@ -1 +0,0 @@ -alter table wx_credit_history add change_purpose varchar(255) \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904222237__CHANGE_SCORERULES.sql b/mallinkAdmin/src/main/resources/db/migration/V201904222237__CHANGE_SCORERULES.sql deleted file mode 100644 index 91ab1f81d..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904222237__CHANGE_SCORERULES.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE wx_score_rules -ADD COLUMN type smallint(2) not null default '1' COMMENT '1成长值 2积分' AFTER `update_date`, -ADD COLUMN clear_year int(11) COMMENT '清除前多少年积分' AFTER `type`; - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904231303__ADD_BUSINESS.sql b/mallinkAdmin/src/main/resources/db/migration/V201904231303__ADD_BUSINESS.sql deleted file mode 100644 index 784253762..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904231303__ADD_BUSINESS.sql +++ /dev/null @@ -1,6 +0,0 @@ -INSERT INTO `wx_business` (`id`, `title`, `type`, `create_date`, `update_date`) -VALUES - (7, '美妆', 1, '2018-08-10 22:15:17', '2019-04-09 19:32:30'), - (8, '珠宝', 1, '2018-08-10 22:15:17', '2019-04-09 19:32:30'), - (9, '服务', 1, '2018-08-10 22:15:17', '2019-04-09 19:32:30'), - (10, '家居', 1, '2018-08-10 22:15:17', '2019-04-09 19:32:30'); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904231317__ADD_DEFAULT_ZERO_CREDIT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904231317__ADD_DEFAULT_ZERO_CREDIT.sql deleted file mode 100644 index dadfb4bfc..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904231317__ADD_DEFAULT_ZERO_CREDIT.sql +++ /dev/null @@ -1,4 +0,0 @@ -alter table wx_c_user_basic_info alter column credit set default 0; -alter table wx_c_user alter column credit set default 0; -update wx_c_user_basic_info set credit = 0 where credit is null; -update wx_c_user set credit = 0 where credit is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904231500__UPDATE_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904231500__UPDATE_BILL.sql deleted file mode 100644 index 35a4313ef..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904231500__UPDATE_BILL.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table wx_bill_rent add column comments varchar (255) default ''; -alter table wx_bill_property add column comments varchar(255) default ''; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904231939__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904231939__ADD_FLOW.sql deleted file mode 100644 index 969831f0a..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904231939__ADD_FLOW.sql +++ /dev/null @@ -1,4 +0,0 @@ - - -ALTER TABLE `wx_msg_model` -ADD COLUMN `email_bg_img` varchar(300) DEFAULT NULL COMMENT '邮箱背景图片'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904241010__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904241010__ADD_MSG_MODEL.sql deleted file mode 100644 index ab46886e2..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904241010__ADD_MSG_MODEL.sql +++ /dev/null @@ -1,17 +0,0 @@ -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(79,'456','9','场景投放','富茂','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(109,'1001','9','场景投放','长融世贸广场','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(209,'1002','9','场景投放','同保楼 同福街','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(309,'1003','9','场景投放','杭州东站西子国际','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(409,'1004','9','场景投放','莱迪1086商业中心','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(509,'1005','9','场景投放','永修铜锣湾广场','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(609,'1006','9','场景投放','欧堡利亚海悦城','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(709,'1007','9','场景投放','澳林广场','亲爱的,悄悄得送您一张{title},请到{app}微信小程序中使用吧!',now(),1,0,null); - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904241037__L_MSG_MODEL_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201904241037__L_MSG_MODEL_DATA.sql deleted file mode 100644 index 69c4d60d4..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904241037__L_MSG_MODEL_DATA.sql +++ /dev/null @@ -1,77 +0,0 @@ -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'http://202.165.179.86:8081/images/WechatIMG5130.png'); - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1001', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'); - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1002', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'); - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1003', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'); - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1004', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'); - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1005', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'); - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1006', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'); - - -INSERT INTO `wx_msg_model` (`id`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), '1007', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'); - - - - - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904241043__L_WX_TOPIC.sql b/mallinkAdmin/src/main/resources/db/migration/V201904241043__L_WX_TOPIC.sql deleted file mode 100644 index d724f4b53..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904241043__L_WX_TOPIC.sql +++ /dev/null @@ -1,18 +0,0 @@ -DROP TABLE IF EXISTS `wx_topic` ; - -CREATE TABLE `wx_topic` ( - `id` bigint(64) NOT NULL COMMENT 'id', - `tenant_id` varchar(50) DEFAULT NULL COMMENT '租户id', - `name` varchar(300) NOT NULL DEFAULT '' COMMENT '名称', - `title` varchar(500) DEFAULT '0' COMMENT '标题', - `cover` varchar(300) DEFAULT '0' COMMENT '封面', - `advert` varchar(300) DEFAULT '0' COMMENT '广告图', - `begin_time` datetime DEFAULT NULL COMMENT '开始时间', - `end_time` datetime DEFAULT NULL COMMENT '结束时间', - `content` text COMMENT '内容', - `status` tinyint(1) DEFAULT '1' COMMENT '状态1生效2失效3作废', - `bg_color` varchar(300) DEFAULT NULL COMMENT '背景颜色', - `createtime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updatetime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专题表'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904241243__L_SMS_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904241243__L_SMS_MODEL.sql deleted file mode 100644 index 1f83e28bb..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904241243__L_SMS_MODEL.sql +++ /dev/null @@ -1,4 +0,0 @@ -update wx_msg_validationcode_model set content='{userName}提交了一个{bustype}待您审批,电脑登陆{page} 查看您的待办。' where name = '代办通知'; -update wx_msg_validationcode_model set content='{userName}同意编号{contract}的{bustype}审批,已呈送至{toUserName},登录{page}查看审批进度。' where name = '审批通知'; -update wx_msg_validationcode_model set content='编号{contract}的{bustype}已通过审批,请登录{page} 跟进后续工作。' where name = '通过审批通知'; -update wx_msg_validationcode_model set content='编号{contract}的{bustype}审批被驳回,请登录{page} 查看审批明细。' where name = '驳回通知'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904241615__UPDATE_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904241615__UPDATE_CONTRACT.sql deleted file mode 100644 index 3cfe2bb71..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904241615__UPDATE_CONTRACT.sql +++ /dev/null @@ -1,96 +0,0 @@ -DELIMITER $$ -DROP PROCEDURE IF EXISTS `contract_update`$$ -CREATE PROCEDURE `contract_update`() -LANGUAGE SQL -NOT DETERMINISTIC -CONTAINS SQL -SQL SECURITY DEFINER -COMMENT '' -begin - #定义一个循环结束的标记 - declare done int default false; - #定义一个循环总条数 - declare total int; - #定义一个循环开始值 - declare i int; - #定义商铺相关字段 - declare _shop_id varchar(100); - declare _shop_number varchar(100); - declare _build_area varchar(100); - declare _operation_area varchar(100); - declare _floor varchar(100); - declare _img_url varchar(1024); - declare _addr varchar(100); - declare _type smallint(2); - declare _status smallint(2); - declare _manager varchar(100); - declare _manager_phone varchar(100); - declare _building varchar(100); - #租赁合同相关信息 - declare _rent_id bigint(64); - declare _rent_area varchar(100); - declare _adjust_ratio json; - declare _price decimal(10,2); - declare _deposit decimal(10,2); - - declare _adjust_ratio_new json; - declare _adjust_ratio_value decimal(10,2); - - - declare rent_cursor cursor for select id,shop_id from wx_rent_contract where rent_shop_type=1; - declare rent_total_cursor cursor for select count(*) total from wx_rent_contract where rent_shop_type=1; - declare continue handler for not found set done = true; - - set i=1; - open rent_cursor; - open rent_total_cursor; - fetch rent_cursor into _rent_id,_shop_id; - fetch rent_total_cursor into total; - repeat - if not done then - #查询商铺信息 - select s.shop_number,s.build_area,s.img_url,s.operation_area,s.status,b.building_name,f.floor_name, - s.manager,s.manager_phone,type,s.addr - into _shop_number,_build_area,_img_url,_operation_area,_status,_building,_floor,_manager,_manager_phone,_type,_addr - from wx_shop s left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id - where s.id=_shop_id; - #查询合同信息 - select rent_area,adjust_ratio,truncate(price/100,2),truncate(deposit/100,2) into _rent_area,_adjust_ratio,_price,_deposit - from wx_rent_contract where id=_rent_id; - #解析年调整比例 - set @j=0; - set _adjust_ratio_new = json_array(); - while (select json_length(_adjust_ratio))>0 and @j<>(select json_length(_adjust_ratio)) do - set @ratio_index=concat("$[",@j,"]"); - select truncate(json_extract(_adjust_ratio,@ratio_index)/100,2) into _adjust_ratio_value; - select json_array_insert(_adjust_ratio_new,@ratio_index,_adjust_ratio_value) into _adjust_ratio_new; - set @j=@j+1; - end while; - #更新租赁合同信息 - update wx_rent_contract set rent_info=json_array(JSON_OBJECT('shopId',_shop_id,'id',_shop_id,'shopNumber',_shop_number, - 'price',_price,'deposit',_deposit,'adjustRatio',_adjust_ratio_new,'addr',_addr,'buildArea',_build_area,'imgUrl',_img_url, - 'operationArea',_operation_area,'building',_building,'floor',_floor,'manager',_manager,'managerPhone',_manager_phone, - 'type',_type,'status',_status,'rentArea',_rent_area)) - where id=_rent_id; - #更新物业信息 - update wx_property_contract set rent_info=json_array(JSON_OBJECT('shopId',_shop_id,'id',_shop_id,'shopNumber',_shop_number, - 'price',_price,'deposit',_deposit,'adjustRatio',_adjust_ratio_new,'addr',_addr,'buildArea',_build_area,'imgUrl',_img_url, - 'operationArea',_operation_area,'building',_building,'floor',_floor,'manager',_manager,'managerPhone',_manager_phone, - 'type',_type,'status',_status,'rentArea',_rent_area)) - where rent_contract_id=_rent_id; - fetch rent_cursor into _rent_id,_shop_id; - end if; - IF i<>total then - set done =false; - set i=i+1; - else - set done = true; - end if; - until done - end repeat; - close rent_cursor; - close rent_total_cursor; - -end $$ -DELIMITER ; -### call contract_update(); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql b/mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql deleted file mode 100644 index d00e1af3f..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904251504__UPDATE_MALL_COVER_LEN.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table wx_mall -CHANGE COLUMN `weapp_share_cover_img` `weapp_share_cover_img` VARCHAR(1024) NULL COMMENT '分享封面图片'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql deleted file mode 100644 index c2509a81b..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904251610__UPDATE_BILL.sql +++ /dev/null @@ -1,64 +0,0 @@ -#租赁账单1 -alter table wx_bill_rent -change column late_pay_price late_pay_price bigint(12), -change column revenue revenue bigint(12), -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12), -change column need_pay need_pay bigint(12) -; -#租赁押金账单2 -alter table wx_bill_rent_deposit -change column return_price return_price bigint(12), -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12), -change column need_pay need_pay bigint(12) -; -#物业账单3 -alter table wx_bill_property -change column late_pay_price late_pay_price bigint(12), -change column revenue revenue bigint(12), -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12), -change column need_pay need_pay bigint(12) -; -#物业押金账单4 -alter table wx_bill_property_deposit -change column return_price return_price bigint(12), -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12), -change column need_pay need_pay bigint(12) -; -#日常账单5 -alter table wx_bill_daily -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12) -; -#其他账单6 -alter table wx_bill_other -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12) -; -#其他押金账单7 -alter table wx_bill_other_deposit -change column return_price return_price bigint(12), -change column receive_pay receive_pay bigint(12), -change column pay pay bigint(12), -change column owe owe bigint(12) -; -#租赁合同 -alter table wx_rent_contract -change column price price bigint(12), -change column deposit deposit bigint(12), -change column revenue revenue bigint(12) -; -#物业合同 -alter table wx_property_contract -change column price price bigint(12), -change column deposit deposit bigint(12) -; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904252020__UPDATE_PAY_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904252020__UPDATE_PAY_BILL.sql deleted file mode 100644 index cf57a522a..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904252020__UPDATE_PAY_BILL.sql +++ /dev/null @@ -1,3 +0,0 @@ -alter table wx_pay_bill -change column pay_amount pay_amount bigint(12) -; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql deleted file mode 100644 index f1ebf265b..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_msg_validationcode_model set content='{s6}(动态验证码),请在5分钟内填写' where type in (1,6); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904271735__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904271735__UPDATE_MSG_MODEL.sql deleted file mode 100644 index 13d8a5232..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201904271735__UPDATE_MSG_MODEL.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_msg_validationcode_model set content='{s6}(动态验证码),请在5分钟内填写',minutes=5 where type in (1,6); \ No newline at end of file