1hjz
/
1hjz-document
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://gogs.1hhd.com:10022/1hjz-3N/1hjz-document 

# Conflicts:
#	53项目部署说明书/v3.0.0/1hjz_v3.0.0.sql
master
nesxy 6 years ago
parent
df137c5255 59fdf15dee
commit
f83333b51a
3 changed files with 121 additions and 0 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      53项目部署说明书/v3.0.0/1hjz_v3.0.0.sql
  2. BIN
      55功能使用说明书/一号家政后台管理系统-推广中心操作说明.pdf
  3. BIN
      55功能使用说明书/一号家政商城-推广中心操作说明.pdf

121
53项目部署说明书/v3.0.0/1hjz_v3.0.0.sql
View File

@ -133,6 +133,7 @@ COLLATE='utf8mb4_general_ci'
ENGINE=InnoDB
;
<<<<<<< HEAD
ALTER TABLE `vgoods`
CHANGE COLUMN `sale_type` `sale_type` TINYINT(4) NULL DEFAULT '1' COMMENT '分销类型:1-实付比例，2-固定金额' AFTER `coupon_batch_id`;
@ -144,6 +145,121 @@ ALTER TABLE `goods_category`
ADD COLUMN `high_service_cost` BIGINT NULL DEFAULT '0' COMMENT '单次服务成本-高级' AFTER `middle_service_cost`,
ADD COLUMN `material_cost` BIGINT NULL DEFAULT '0' COMMENT '单次物料成本' AFTER `high_service_cost`;
=======
CREATE TABLE `book_serve_statement` (
`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
`serve_no` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '服务单号',
`unit_price` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '单次服务价格',
`service_staff_level` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '服务人员等级',
`service_staff_id` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '服务人员id',
`service_cost` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '服务成本',
`scheduling_cost` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '调度费',
`scheduling_cost_pec` INT(11) NOT NULL DEFAULT '0' COMMENT '调度费比例',
`material_cost` BIGINT(20) NULL DEFAULT '0' COMMENT '单次物料成本',
`platform_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '平台抽成比例',
`plalform_division` BIGINT(20) NULL DEFAULT '0' COMMENT '平台抽成金额',
`merchant_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '商户抽成比例',
`merchant_division` BIGINT(20) NULL DEFAULT '0' COMMENT '商户抽成金额',
`merchant_id` BIGINT(20) NULL DEFAULT '0' COMMENT '商户账号id',
`district_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '区总抽成比例',
`district_division` BIGINT(20) NULL DEFAULT '0' COMMENT '区总抽成金额',
`district_id` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '区总员id',
`promoter_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '推广员抽成比例',
`promoter_division` BIGINT(20) NULL DEFAULT '0' COMMENT '推广员抽成金额',
`promoter_id` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '推广人员id',
`partner_earnings` BIGINT(20) NULL DEFAULT '0' COMMENT '合伙人收益',
`partner_id` VARCHAR(32) NULL DEFAULT '' COMMENT '合伙人id',
`create_time` BIGINT(20) NULL DEFAULT '0',
PRIMARY KEY (`id`)
)
COMMENT='服务完成后对应的结算单'
COLLATE='utf8mb4_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `order_anticipate_division` (
`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
`order_no` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '订单编号',
`parent_order_no` VARCHAR(32) NULL DEFAULT '' COMMENT '主订单编号',
`pay_money` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '订单价格',
`service_cost` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '预期服务成本',
`scheduling_cost` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '预期调度成本',
`material_cost` BIGINT(20) NULL DEFAULT '0' COMMENT '预期物料成本',
`platform_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '平台抽成比例',
`platform_division` BIGINT(20) NULL DEFAULT '0' COMMENT '平台抽成金额',
`platform_division_one` BIGINT(20) NULL DEFAULT '0' COMMENT '平台抽成金额-单次',
`platform_division_settled` BIGINT(20) NULL DEFAULT '0' COMMENT '已结算平台抽成金额',
`merchant_no` VARCHAR(32) NULL DEFAULT '' COMMENT '商户账号id',
`merchant_division` BIGINT(20) NULL DEFAULT '0' COMMENT '商户抽成金额',
`merchant_division_one` BIGINT(20) NULL DEFAULT '0' COMMENT '商户抽成金额-单次',
`merchant_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '商户抽成比例',
`merchant_division_settled` BIGINT(20) NULL DEFAULT '0' COMMENT '已结算商户抽成金额',
`district_id` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '区总员id',
`district_division` BIGINT(20) NULL DEFAULT '0' COMMENT '区总抽成金额',
`district_division_one` BIGINT(20) NULL DEFAULT '0' COMMENT '区总抽成金额-单次',
`district_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '区总抽成比例',
`material_cost_settled` BIGINT(20) NULL DEFAULT '0' COMMENT '已结算物料成本',
`scheduling_cost_settled` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '已结算调度成本',
`district_division_settled` BIGINT(20) NULL DEFAULT '0' COMMENT '已结算区总抽成金额',
`promoter_id` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '推广人员id',
`promoter_division` BIGINT(20) NULL DEFAULT '0' COMMENT '推广员抽成金额',
`promoter_division_one` BIGINT(20) NULL DEFAULT '0' COMMENT '推广员抽成金额-单次',
`promoter_division_proportion` INT(11) NULL DEFAULT '0' COMMENT '推广员抽成比例',
`promoter_division_settled` BIGINT(20) NULL DEFAULT '0' COMMENT '已结算推广员抽成金额',
`partner_id` VARCHAR(32) NULL DEFAULT '' COMMENT '合伙人id',
`partner_earnings` BIGINT(20) NULL DEFAULT '0' COMMENT '合伙人收益',
`money_after_deduct` BIGINT(20) NULL DEFAULT '0' COMMENT '扣除固定支出后剩余金额',
`money_after_deduct_one` BIGINT(20) NULL DEFAULT '0' COMMENT '扣除固定支出后剩余金额-单次',
`partner_earnings_settled` BIGINT(20) NULL DEFAULT '0' COMMENT '已结算合伙人收益',
`service_cost_settled` BIGINT(20) NOT NULL DEFAULT '0' COMMENT '已结算服务成本',
`create_time` BIGINT(20) NULL DEFAULT '0' COMMENT '创建时间',
`update_time` BIGINT(20) NULL DEFAULT '0' COMMENT '更新时间',
`settle_status` TINYINT(4) NULL DEFAULT '0' COMMENT '订单结算状态 0 未结算完 1已完成结算',
`refund_status` TINYINT(4) NULL DEFAULT '0' COMMENT '订单退款状态 0 未退款 1已退款',
PRIMARY KEY (`id`)
)
COMMENT='订单预期分成情况'
COLLATE='utf8mb4_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `promoter` (
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
`user_id` VARCHAR(32) NULL DEFAULT '' COMMENT '用户id',
`parent_id` VARCHAR(32) NULL DEFAULT '' COMMENT '上级id',
`merchant_no` VARCHAR(32) NULL DEFAULT '' COMMENT '商户编号',
`unique_id` VARCHAR(32) NULL DEFAULT '' COMMENT 'md5用户id生成的8位唯一字符串',
`division_proportion` INT(11) NULL DEFAULT '0' COMMENT '通用分成比例 万分比',
`accumulative_total` BIGINT(20) NULL DEFAULT '0' COMMENT '累计收益',
`type` TINYINT(4) NULL DEFAULT '0' COMMENT '类型 2员工 1客户 0渠道',
`status` TINYINT(4) NULL DEFAULT '0' COMMENT '状态',
`nick_name` VARCHAR(255) NULL DEFAULT '' COMMENT '昵称',
`age` INT(5) NULL DEFAULT '0' COMMENT '年龄',
`mobile` VARCHAR(16) NULL DEFAULT '' COMMENT '手机号',
`district_id` INT(10) NULL DEFAULT '0' COMMENT '区id',
`detail_address` VARCHAR(128) NULL DEFAULT '' COMMENT '详细地址',
`full_address` VARCHAR(128) NULL DEFAULT '' COMMENT '完整住址',
`lat` DECIMAL(10,6) NULL DEFAULT '0.000000' COMMENT '纬度',
`lng` DECIMAL(10,6) NULL DEFAULT '0.000000' COMMENT '经度',
`head_url` VARCHAR(50) NULL DEFAULT '' COMMENT '头像',
`entry_date` DATE NULL DEFAULT NULL COMMENT '入职时间',
`create_at` BIGINT(20) NULL DEFAULT '0' COMMENT '创建时间',
`create_by` VARCHAR(20) NULL DEFAULT '' COMMENT '创建者',
`update_at` BIGINT(20) NULL DEFAULT '0' COMMENT '更新时间',
`update_by` VARCHAR(20) NULL DEFAULT '' COMMENT '更新者',
`del_flag` TINYINT(4) NULL DEFAULT '0' COMMENT '删除标志',
`channel_id` BIGINT(20) NULL DEFAULT '0' COMMENT '渠道id',
PRIMARY KEY (`id`),
UNIQUE INDEX `user_id` (`user_id`),
UNIQUE INDEX `unique_id` (`unique_id`),
INDEX `merchant_no` (`merchant_no`)
)
COMMENT='推广员资料表'
COLLATE='utf8mb4_general_ci'
ENGINE=InnoDB
AUTO_INCREMENT=133
;
>>>>>>> 59fdf15deea1be2868af31c564a4cb9d1395ca75
/*==============================================================*/
/* Table: vorder */
@ -159,6 +275,7 @@ ALTER TABLE `vorder`
alter table consumer_info
add column salesman_id VARCHAR(32) NULL DEFAULT '' COMMENT '销售人员id';
<<<<<<< HEAD
INSERT INTO `function_permission` (`id`, `name`, `url`, `method`, `create_time`, `del_flag`) VALUES (238, '推广员列表', '/admin/web/promoters', 'GET', 1, 0);
INSERT INTO `function_permission` (`id`, `name`, `url`, `method`, `create_time`, `del_flag`) VALUES (239, '推广员明细', '(/admin/web/promoters/).*', 'GET', 1, 0);
INSERT INTO `function_permission` (`id`, `name`, `url`, `method`, `create_time`, `del_flag`) VALUES (240, '更新推广员', '(/admin/web/promoters/).*', 'PUT', 1, 0);
@ -170,3 +287,7 @@ INSERT INTO `function_permission` (`id`, `name`, `url`, `method`, `create_time`,
INSERT INTO `function_permission` (`id`, `name`, `url`, `method`, `create_time`, `del_flag`) VALUES (246, '导入推广员', '/admin/web/promoters/excel', 'POST', 1, 0);
INSERT INTO `function_permission` (`id`, `name`, `url`, `method`, `create_time`, `del_flag`) VALUES (247, '初始化推广员', '/admin/updTableData/initPromoter', 'GET', 1, 0);
=======
ALTER TABLE `cleaner_info`
ADD COLUMN `level` TINYINT(4) NULL DEFAULT '1' COMMENT '1-高级 2-资深 3金牌' AFTER `del_flag`;
>>>>>>> 59fdf15deea1be2868af31c564a4cb9d1395ca75

BIN
55功能使用说明书/一号家政后台管理系统-推广中心操作说明.pdf
View File

BIN
55功能使用说明书/一号家政商城-推广中心操作说明.pdf
View File

Write Preview
Loading…
Cancel
Save