From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/config/db/increment/签到活动.sql | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git "a/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql" "b/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
index 56f55ba..f7b1b4a 100644
--- "a/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
+++ "b/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
@@ -116,6 +116,93 @@
ALTER TABLE `shop_activities`
ADD COLUMN `act_code` varchar(200) NULL COMMENT '活动编码' AFTER `id`;
+ALTER TABLE `activity_sign_award_set`
+ ADD COLUMN `award_state` int(4) NULL COMMENT '奖品是否有效（1：有效 2：无效）' AFTER `company_id`;
+
+ALTER TABLE `activity_sign_award_set`
+ ADD COLUMN `goods_name` varchar(200) NULL COMMENT '产品名称' AFTER `coupon_id`;
+
+ALTER TABLE `activity_sign_award_set`
+ ADD COLUMN `coupon_name` varchar(200) NULL COMMENT '优惠券名' AFTER `score_cnt`;
+
+ALTER TABLE `activity_sign_record`
+ CHANGE COLUMN `open_id` `user_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'openID' AFTER `id`;
+
+ALTER TABLE `activity_sign_receive_record`
+ CHANGE COLUMN `open_id` `user_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'openID' AFTER `id`;
+
+ /**
+ * 核销记录
+ * @author yourName
+ * @date 2021-04-08 14:25
+ */
+ CREATE TABLE activity_sign_writeoff(
+ create_by varchar(100) NOT NULL COMMENT '创建人',
+ create_time datetime NOT NULL COMMENT '创建时间',
+ update_by varchar(100) NOT NULL COMMENT '更新人',
+ update_time datetime NOT NULL COMMENT '更新时间',
+ id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+
+ writeoff_time datetime COMMENT '核销时间',
+
+ writeoff_user varchar(100) COMMENT '核销员',
+
+ writeoff_code varchar(100) COMMENT '兑奖码',
+
+ act_id bigint(20) COMMENT '活动ID',
+
+ award_id bigint(20) COMMENT '奖品ID',
+
+ win_time datetime COMMENT '中奖时间',
+
+ state int(4) COMMENT '状态',
+
+ user_id bigint(20) COMMENT '中奖者ID',
+
+ logistics_id bigint(20) COMMENT '物流ID',
+
+ receive_id bigint(20) COMMENT '中奖记录ID',
+
+ company_id bigint(20) COMMENT '公司ID',
+
+ shop_id bigint(20) COMMENT '店铺ID',
+
+ writeoff_userid bigint(20) COMMENT '核销员ID',
+
+PRIMARY KEY(id)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='核销记录';
+
+ALTER TABLE `activity_sign_receive_record`
+ADD COLUMN `consignee` varchar(200) NULL COMMENT '收货人' AFTER `user_id`;
+
+ALTER TABLE `activity_sign_receive_record`
+ADD COLUMN `consignee_phone` varchar(50) NULL COMMENT '联系电话' AFTER `user_id`;
+
+ALTER TABLE `activity_sign_receive_record`
+ADD COLUMN `consignee_address` varchar(300) NULL COMMENT '收货地址' AFTER `consignee_phone`;
+
+ALTER TABLE `shop_delivery_info`
+ADD COLUMN `receive_id` bigint(20) NULL COMMENT '奖品领取ID' AFTER `company_id`;
+
+ALTER TABLE `activity_sign_award_set`
+ ADD COLUMN `customer_phone` varchar(100) NULL COMMENT '客服电话' AFTER `company_id`;
+
+ALTER TABLE `shop_delivery_info`
+ MODIFY COLUMN `order_id` int(11) NULL AFTER `logistics_company`;
+
+ALTER TABLE `shop_delivery_info`
+ MODIFY COLUMN `order_no` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER `user_id`;
+
+
+
+
+
+
+
+
+
+
+
--
Gitblit v1.9.1