nyx sql: 更新

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

-USE rockwell_key;
+USE rockwell_key;
@@ -9,6 +9,7 @@ USE rockwell_key;
 DROP VIEW IF EXISTS view_activity_info;
 DROP VIEW IF EXISTS view_activity_info;
 CREATE VIEW view_activity_info
 CREATE VIEW view_activity_info
 AS 
 AS 
-SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.note_image, aa.member_id, bb.member_status, aa.create_datetime, aa.update_datetime
+SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.quiz, aa.point, IFNULL(cc.product_desc,"") as product_desc, IFNULL(cc.price,0) as price, aa.note_image, aa.member_id, bb.member_status, aa.create_datetime, aa.update_datetime
 FROM tbl_activity aa
 FROM tbl_activity aa
 LEFT JOIN tbl_member bb ON aa.member_id=bb.id
 LEFT JOIN tbl_member bb ON aa.member_id=bb.id
+LEFT JOIN tbl_product cc ON aa.activity_id=cc.activity_id AND cc.default_status='01'
\ No newline at end of file

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

-USE rockwell_key;
+USE rockwell_key;
@@ -18,6 +18,7 @@ CREATE TABLE tbl_product(
   `product_id` VARCHAR(100) COMMENT 'product的id, uuid format',
   `product_id` VARCHAR(100) COMMENT 'product的id, uuid format',
   `activity_id` VARCHAR(100) COMMENT 'activity的id, uuid format',
   `activity_id` VARCHAR(100) COMMENT 'activity的id, uuid format',
   `product_status` VARCHAR(10) DEFAULT '00' COMMENT '商品状态: 00:非可售 01:可售', 
   `product_status` VARCHAR(10) DEFAULT '00' COMMENT '商品状态: 00:非可售 01:可售', 
+  `default_status` VARCHAR(10) DEFAULT '00' COMMENT '默认状态: 00:普通 01:默认状态; 默认是第一个product', 
   `product_desc` VARCHAR(100) COMMENT '类别说明', 
   `product_desc` VARCHAR(100) COMMENT '类别说明', 
   `price` decimal(10,2) DEFAULT '0.00' COMMENT '价格',
   `price` decimal(10,2) DEFAULT '0.00' COMMENT '价格',
   `stock` int(11) DEFAULT 0 COMMENT '库存数量',
   `stock` int(11) DEFAULT 0 COMMENT '库存数量',
@@ -27,11 +28,11 @@ CREATE TABLE tbl_product(
   KEY `query_key` (`activity_id`, `product_status`))
   KEY `query_key` (`activity_id`, `product_status`))
   ENGINE=INNODB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT='活动所对应的商品名录';
   ENGINE=INNODB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT='活动所对应的商品名录';
 
 
-insert  into `tbl_product`(`product_id`, `activity_id`, `product_status`, `product_desc`, `price`, `stock`, 
+insert  into `tbl_product`(`product_id`, `activity_id`, `product_status`, `default_status`, `product_desc`, `price`, `stock`, 
 						   `create_datetime`,`update_datetime`) 
 						   `create_datetime`,`update_datetime`) 
 values  
 values  
-('pid_001', 'aid_005', '01', '会员', 59, 10, '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
-('pid_002', 'aid_005', '01', '普通用户', 99, 20, '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
-('pid_003', 'aid_006', '01', '意大利红酒周', 199, 10, '2020-05-20 11:24:45', '2020-05-20 11:24:45')
+('pid_001', 'aid_005', '01', '01', '会员', 59, 10, '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
+('pid_002', 'aid_005', '01', '00','普通用户', 99, 20, '2020-05-20 11:24:45', '2020-05-20 11:24:45'),
+('pid_003', 'aid_006', '01', '01','意大利红酒周', 199, 10, '2020-05-20 11:24:45', '2020-05-20 11:24:45')
 ;
 ;
   
   

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

-USE rockwell_key;
+USE rockwell_key;
@@ -5,10 +5,11 @@ USE rockwell_key;
 	
 	
 */
 */
 
 
-DROP VIEW IF EXISTS view_activity_product;
-CREATE VIEW view_activity_product
+DROP VIEW IF EXISTS view_activity_detail;
+CREATE VIEW view_activity_detail
 AS 
 AS 
 
 
-SELECT aa.product_id, aa.activity_id, aa.product_status, aa.product_desc, aa.price, aa.stock, bb.member_name, bb.member_slogan, bb.tag, bb.content, bb.title, aa.product_image, aa.create_datetime, aa.update_datetime
-FROM tbl_product AS aa
-LEFT JOIN view_activity_info bb ON aa.activity_id=bb.activity_id
+SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.quiz, aa.point, IFNULL(cc.product_id,"") as product_id, IFNULL(cc.product_desc,"") as product_desc, IFNULL(cc.product_status,"") as product_status, IFNULL(cc.default_status,"") as default_status, IFNULL(cc.price,0) as price, IFNULL(cc.stock, 0) as stock, aa.note_image, aa.member_id, bb.member_status, aa.create_datetime, aa.update_datetime
+FROM tbl_activity aa
+LEFT JOIN tbl_member bb ON aa.member_id=bb.id
\ No newline at end of file
+LEFT JOIN tbl_product cc ON aa.activity_id=cc.activity_id
\ No newline at end of file

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

-/*
+/*
@@ -68,6 +68,7 @@
 		-- 我的活动 -> 发布	releaseActivity()		
 		-- 我的活动 -> 发布	releaseActivity()		
 	
 	
 	三. 商家活动参与流程
 	三. 商家活动参与流程
+	三. 商家活动参与流程
 	1. 竞答
 	1. 竞答
 		--311 进入竞答, weapp activity.wxml 
 		--311 进入竞答, weapp activity.wxml 
 		--312 点击进入竞答详情页面 weapp activity.wxml <navigator>
 		--312 点击进入竞答详情页面 weapp activity.wxml <navigator>
@@ -183,7 +184,6 @@
 			
 			
 			--如果失败, 回到order.xml
 			--如果失败, 回到order.xml
 
 
-			
 		--待支付页 todo weapp order-onpay.wxml 
 		--待支付页 todo weapp order-onpay.wxml 
 		
 		
 	
 	
@@ -215,11 +215,7 @@
 	
 	
 	六. 商家注册流程
 	六. 商家注册流程
 	todo
 	todo
-	
-	
-	
-	
-	
+-- o
 	
 	
 	sql: 
 	sql: 
 	428 UPDATE tbl_order SET order_status='30', end_datetime=NOW(), update_datetime=NOW() WHERE order_id='oid_001';
 	428 UPDATE tbl_order SET order_status='30', end_datetime=NOW(), update_datetime=NOW() WHERE order_id='oid_001';