From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/config/db/increment/签到活动.sql |  203 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 203 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"
new file mode 100644
index 0000000..966c947
--- /dev/null
+++ "b/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
@@ -0,0 +1,203 @@
+
+/**
+ * 奖品设置表
+ * @author yourName
+ * @date 2021-03-31 16:57
+ */
+ CREATE TABLE activity_sign_award_set(
+  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 '主键',
+ 
+ award_type int(4)    COMMENT '奖项类型(1:自定义产品2:积分3:优惠券4:店铺商品)',
+ 
+ award_rule int(4)    COMMENT '奖项规则(1:每日奖励(默认)2:累计签到天数)',
+ 
+ cumulative_day int(4)    COMMENT '签到累计天数',
+ 
+ award_name varchar(100)    COMMENT '奖项名称',
+ 
+ introduce_img varchar(500)    COMMENT '图片介绍',
+ 
+ introduce_tip varchar(500)    COMMENT '文字介绍',
+ 
+ award_inventory_cnt int(4)    COMMENT '奖项库存数量',
+ 
+ award_distribute_cnt int(4)    COMMENT '已派发数量',
+ 
+ award_way int(4)    COMMENT '兑奖方式(1:线下兑换2:物流配送3:客服兑换)',
+ 
+ operation_tip varchar(500)    COMMENT '操作提示',
+ 
+ prize_address varchar(500)    COMMENT '兑奖地址',
+ 
+ prize_start_time datetime    COMMENT '兑奖期限开始日期',
+ 
+ prize_end_time datetime    COMMENT '兑奖期限结束日期',
+ 
+ wechat_img varchar(500)    COMMENT '客服微信',
+ 
+ score_cnt int(4)    COMMENT '积分数量',
+ 
+ coupon_id varchar(100)    COMMENT '优惠券ID',
+ 
+ goods_id varchar(100)    COMMENT '商品ID',
+ 
+ activity_id bigint(20)    COMMENT '活动主表ID',
+ 
+ company_id bigint(20)    COMMENT '公司ID',
+ 
+PRIMARY KEY(id)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='奖品设置表';
+
+
+
+/**
+ * 领
+ * @author yourName
+ * @date 2021-03-31 16:57
+ */
+ CREATE TABLE activity_sign_receive_record(
+  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 '主键',
+ 
+ open_id varchar(100)    COMMENT 'openID',
+ 
+ receive_time datetime    COMMENT '领取时间',
+ 
+ remark varchar(500)    COMMENT '备注',
+ 
+ award_id bigint(20)    COMMENT '奖品设置表ID',
+ 
+ state int(4)    COMMENT '是否已领取(1:待领取2:已领取)',
+ 
+ write_off_code varchar(100)    COMMENT '核销码',
+ 
+ activity_id bigint(20)    COMMENT '活动主表ID',
+ 
+ company_id bigint(20)    COMMENT '公司ID',
+ 
+PRIMARY KEY(id)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='领取记录表';
+
+
+
+
+/**
+ * 签到记录表
+ * @author yourName
+ * @date 2021-03-31 16:57
+ */
+ CREATE TABLE activity_sign_record(
+  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 '主键',
+ 
+ open_id varchar(100)    COMMENT 'openID',
+ 
+ sign_time datetime    COMMENT '签到时间',
+ 
+ cumulative_day int(4)    COMMENT '累计签到天数',
+ 
+ activity_id bigint(20)    COMMENT '活动主表ID',
+ 
+ company_id bigint(20)    COMMENT '公司ID',
+ 
+PRIMARY KEY(id)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='签到记录表';
+
+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`;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

--
Gitblit v1.9.1