nyx sql: 数据更新

1. 添加collect和数据表和数据视图
2. 给活动里添加北京和成都的信息

增值产品-小程序及app/doc/create_table_sql/key/create_table_activity.sql

-USE rockwell_key;
+USE rockwell_key;
@@ -105,12 +105,13 @@ VALUES
 ('aid_002', '01', '竞答', 'Renaissance Bar威士忌知识竞答', '', 100, '共10题::可获得5积分', '290::191::195:196::283::201::300::342::355::214', 5.0, 'mid_123', '', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/%E5%BE%AE%E4%BF%A1%E6%88%AA%E5%9B%BE_20200710174939.png','2020-05-29 16:01:48', '2020-05-29 16:01:48'),
 ('aid_003', '01', '竞答', '叁年间知识竞答', '', 30, '共5题::可获得5积分', '199::191::295:236::200', 5.0, 'mid_456', '', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20200810202018.jpg::http://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/tmp_93f6ac372755b4efc4f0941cd6a8a007.jpg', '2020-05-25 14:39:20', '2020-05-25 14:39:20'),
 ('aid_004', '01', '竞答', 'Cin Cin知识竞答', '', 10, '共5题::可获得5积分', '190::191::195:196::313', 5.0, 'mid_001', '', 'http://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/tmp_927aed9aa3b4fb2d857680fae75b76b2.jpg', '2020-05-29 14:48:11','2020-05-29 14:48:11'),
-('aid_005', '01', '活动', 'Renaissance Bar威士忌四小杯特饮活动', '威士忌特饮日', 4, '一次领略泥煤的各种风味', '', 0.0, 'mid_123', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
-('aid_006', '01', '活动', '叁年间-罗翌 意大利红酒周', '意大利红酒周', 10, '叁年间的专业加上罗翌的品质，你值得期待', '', 0.0, 'mid_456', 'addid_002', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
-('aid_007', '01', '活动', '还有三天我们就要去狂欢啦~', '周年庆品酒会', 100, '这个仲夏里最值得期待的活动（详情回顾），终于尘埃落定。\n服务了那么多场的大小展会活动，这一回总算是轮到我们自己了。\n在新的八月德国“降温组”发布两天就售罄后，在这个周五的晚上我们想用最简单的安排告诉你们', '', 0.0, 'mid_456', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
-('aid_008', '01', '活动', '还有三天我们就要去狂欢啦~', '烤肉海鲜自助', 100, '这个仲夏里最值得期待的活动（详情回顾），终于尘埃落定。\n服务了那么多场的大小展会活动，这一回总算是轮到我们自己了。\n在新的八月德国“降温组”发布两天就售罄后，在这个周五的晚上我们想用最简单的安排告诉你们', '', 0.0, 'mid_456', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
-('aid_009', '01', '活动', '【8.8】疯狂系列四：红玫瑰与白玫瑰--丹魄', '红丹魄白丹魄', 100, '痴狂系列，歌海娜的历史被翻开新篇章，据说歌海娜早已经不是原本的样貌。十二款酒，竟无一雷同，每一支都尽态极妍。那些原本被忽略的小产区，试过便不由得喜出望外。', '', 0.0, 'mid_456', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45')
-
+('aid_005', '01', '活动', 'Renaissance Bar威士忌四小杯特饮活动', '威士忌特饮日', 4, '一次领略泥煤的各种风味', '', 0.0, 'mid_123', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/%E5%BE%AE%E4%BF%A1%E6%88%AA%E5%9B%BE_20200710174939.png', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
+('aid_006', '01', '活动', '叁年间-罗翌 意大利红酒周', '意大利红酒周', 10, '叁年间的专业加上罗翌的品质，你值得期待', '', 0.0, 'mid_456', 'addid_002', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20200810202018.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
+('aid_007', '01', '活动', '还有三天我们就要去狂欢啦~', '周年庆品酒会', 100, '这个仲夏里最值得期待的活动（详情回顾），终于尘埃落定。\n服务了那么多场的大小展会活动，这一回总算是轮到我们自己了。\n在新的八月德国“降温组”发布两天就售罄后，在这个周五的晚上我们想用最简单的安排告诉你们', '', 0.0, 'mid_456', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/santian.png', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
+('aid_008', '01', '活动', '还有三天我们就要去狂欢啦~', '烤肉海鲜自助', 100, '这个仲夏里最值得期待的活动（详情回顾），终于尘埃落定。\n服务了那么多场的大小展会活动，这一回总算是轮到我们自己了。\n在新的八月德国“降温组”发布两天就售罄后，在这个周五的晚上我们想用最简单的安排告诉你们', '', 0.0, 'mid_456', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/santian.png', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
+('aid_009', '01', '活动', '【8.8】疯狂系列四：红玫瑰与白玫瑰--丹魄', '红丹魄白丹魄', 100, '痴狂系列，歌海娜的历史被翻开新篇章，据说歌海娜早已经不是原本的样貌。十二款酒，竟无一雷同，每一支都尽态极妍。那些原本被忽略的小产区，试过便不由得喜出望外。', '', 0.0, 'mid_456', 'addid_001', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/baimeigui.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
+('aid_010', '01', '活动', '黑石卡杜12年+小吃+苏打三瓶', '黑石卡杜', 0, '黑石卡杜12年+小吃+苏打三瓶', '', 0.0, 'mid_457', 'addid_003', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/xunyue_activity.png', '2020-03-27 11:24:45', '2020-03-27 11:24:45'),
+('aid_011', '01', '活动', '任意两杯鸡尾酒双人套餐', '鸡尾酒双人份', 0, 'cocktail任意两杯鸡尾酒', '', 0.0, 'mid_458', 'addid_004', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/xintu_activity.jpg', '2020-03-27 11:24:45', '2020-03-27 11:24:45')
 
 
 

增值产品-小程序及app/doc/create_table_sql/key/create_table_address.sql

-USE rockwell_key;
+USE rockwell_key;
@@ -34,8 +34,12 @@ CREATE TABLE tbl_address (
 
 INSERT  INTO `tbl_address`(`address_id`, `address_name`, `address_status`, `client_id`, `create_datetime`,`update_datetime`) 
 VALUES 
-('addid_001', '复兴中路523弄6号一楼', '01', 'mid_123', '2020-05-29 16:01:48', '2020-05-29 16:01:48'),
-('addid_002', '上海市徐汇区永嘉路692号2栋1楼', '01', 'mid_456', '2020-05-29 16:01:48', '2020-05-29 16:01:48')
+('addid_001', '上海市黄浦区复兴中路523弄6号一楼', '01', 'mid_123', '2020-05-29 16:01:48', '2020-05-29 16:01:48'),
+('addid_002', '上海市徐汇区永嘉路692号2栋1楼', '01', 'mid_456', '2020-05-29 16:01:48', '2020-05-29 16:01:48'),
+('addid_003', '北京市东城区东直门北大街8号楼迤西东直门工商所院内', '01', 'mid_457', '2020-05-29 16:01:48', '2020-05-29 16:01:48'),
+('addid_004', '成都市泰和二街40号英祥财富领域一楼', '01', 'mid_458', '2020-05-29 16:01:48', '2020-05-29 16:01:48')
+
+
 ;
 
 

增值产品-小程序及app/doc/create_table_sql/key/create_table_collect.sql

+USE rockwell_key;
+USE rockwell_key;
+
+/*
+	用户-活动收藏表 tbl_collect
+	
+*/
+
+DROP TABLE IF EXISTS tbl_collect;
+CREATE TABLE tbl_collect (
+  `collect_id` INT(20) NOT NULL AUTO_INCREMENT COMMENT '收藏的id, 自增', 
+  `collect_status` VARCHAR(10) DEFAULT '10' COMMENT '收藏状态: 00: 未收藏; 01:已收藏',
+  `user_id` VARCHAR(100) COMMENT '用户的id, uuid format, like uid_001', 
+  `activity_id` VARCHAR(100) COMMENT '活动的id, uuid format, like aid_001', 
+  `create_datetime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `update_datetime` DATETIME DEFAULT NULL,
+  PRIMARY KEY(`collect_id`),
+  KEY `query_key` (`collect_status`, `user_id`),
+  unique index `unique_key` (`user_id`, `activity_id`))
+  ENGINE=INNODB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT='rockwell 用户活动收藏表';
+
+INSERT  INTO `tbl_collect`(`collect_status`, `user_id`, `activity_id`, `create_datetime`,`update_datetime`) 
+VALUES 
+('01', 'uid_1a2baea2-77fb-409f-a56a-23e5d21582b8', 'aid_008','2020-05-29 16:01:48', '2020-05-29 16:01:48'),
+('01', 'uid_1a2baea2-77fb-409f-a56a-23e5d21582b8', 'aid_006','2020-05-29 16:01:48', '2020-05-29 16:01:48')
+
+
+
+
+;
+
+

增值产品-小程序及app/doc/create_table_sql/key/create_table_member.sql

-USE rockwell_key;
+USE rockwell_key;
@@ -40,5 +40,11 @@ VALUES
 ('mid_008', '00', '蟹尊苑', '', '巨鹿路889弄21号', '', NULL,NULL,NULL,'2020-03-30 16:23:15','2020-03-30 16:23:17'),
 ('mid_009', '01', '173wine红酒店', '', '上海市黄浦区南昌路173号', '', 31.221501,99.999999,NULL,'2020-06-04 10:52:49',NULL),
 ('mid_123', '01', 'Bar Renaissance', '充满爱与温度, 自由放松的bar', '愚园路610号', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/logo-dir/mid_123.jpg', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
-('mid_456', '01', '叁年间', '', '永嘉路692号1楼', '', NULL,NULL,NULL,'2020-08-04 09:24:58','2020-08-04 09:25:00');
+('mid_456', '01', '叁年间', '用时间煮酒，借酒直抒胸臆，希望你经历了精彩，感受了情感，体验了有趣的人和事', '永嘉路692号1楼', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/logo-dir/mid_456.jpg', NULL,NULL,NULL,'2020-08-04 09:24:58','2020-08-04 09:25:00'),
+('mid_457', '01', '醺悦Whisky Lounge', '', '北京市东城区东直门北大街8号楼迤西东直门工商所院内', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/xunyue_logo.jpg', NULL,NULL,NULL,'2020-08-04 09:24:58','2020-08-04 09:25:00'),
+('mid_458', '01', '星图The Star Bar', '', '成都市泰和二街40号英祥财富领域一楼', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/xingtu_logo.jpg', NULL,NULL,NULL,'2020-08-04 09:24:58','2020-08-04 09:25:00');
+
+
+
+
 ;
\ No newline at end of file

增值产品-小程序及app/doc/create_table_sql/key/create_view_collect.sql

+USE rockwell_key;
+USE rockwell_key;
+
+/*
+	collect 表及对应的 activity info 信息
+	
+	
+*/
+
+DROP VIEW IF EXISTS view_collect;
+CREATE VIEW view_collect
+AS 
+SELECT aa.collect_id, aa.collect_status, aa.user_id, bb.activity_id, bb.activity_status, bb.member_name, bb.member_slogan, bb.tag, bb.title, bb.title_abbr, bb.num_like, bb.content, bb.quiz, bb.point, bb.address_name, bb.product_desc, bb.product_status, bb.default_status, bb.unit_price, bb.note_image, bb.member_id, bb.member_status, bb.member_logo, bb.start_datetime, bb.end_datetime, bb.create_datetime, bb.update_datetime
+FROM tbl_collect aa
+LEFT JOIN view_activity_info bb ON bb.activity_id=aa.activity_id
\ No newline at end of file

增值产品-小程序及app/doc/create_table_sql/mall/create_table_product.sql

-USE rockwell_key;
+USE rockwell_key;
@@ -42,7 +42,9 @@ VALUES
 ('pid_007', 'aid_008', '01', '01','普通用户', 299, 20, '2020-08-14 00:00:00', '2020-08-14 00:00:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
 ('pid_008', 'aid_008', '01', '00','会员', 199, 20, '2020-08-14 00:00:00', '2020-08-14 00:00:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
 ('pid_009', 'aid_009', '01', '01','普通用户', 299, 595, '2020-08-08 19:30:00', '2020-08-08 19:30:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
-('pid_010', 'aid_009', '01', '00','会员', 476, 20, '2020-08-08 19:30:00', '2020-08-08 19:30:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45')
+('pid_010', 'aid_009', '01', '00','会员', 476, 20, '2020-08-08 19:30:00', '2020-08-08 19:30:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
+('pid_011', 'aid_010', '01', '01','黑石卡杜', 709, 500, '2020-08-28 00:00:00', '2020-10-28 00:00:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
+('pid_012', 'aid_011', '01', '01','鸡尾酒双人份', 119, 500, '2020-08-28 00:00:00', '2020-10-28 00:00:00', '2020-05-20 11:24:45', '2020-05-20 11:24:45')
 
 
 

增值产品-小程序及app/doc/create_table_sql/流程及数据测试.sql

-/*
+/*
@@ -23,6 +23,8 @@
 	jd字体主色调 #666
 	其他: #999
 	
+	like_selected #E3393C
+	
 	activity.wxml 
 		竞答|活动 32rpx bold
 		上海 32rpx