记得上下班打卡 | git大法好,push需谨慎

Commit 927f0f1e authored by 胡佳晨's avatar 胡佳晨

增加 快递类型

parent 11fa8970
...@@ -61,6 +61,11 @@ public class KylinOrderTicketStatus implements Serializable,Cloneable { ...@@ -61,6 +61,11 @@ public class KylinOrderTicketStatus implements Serializable,Cloneable {
*/ */
private Integer payStatus; private Integer payStatus;
/**
* 快递模板code
*/
private String produceCode;
/** /**
* 创建时间 * 创建时间
*/ */
...@@ -78,7 +83,7 @@ public class KylinOrderTicketStatus implements Serializable,Cloneable { ...@@ -78,7 +83,7 @@ public class KylinOrderTicketStatus implements Serializable,Cloneable {
*/ */
public Object[] getAddObject() { public Object[] getAddObject() {
return new Object[]{ return new Object[]{
orderTicketStatusId, orderId, expressType, isStudent, transferStatus, status, payStatus, createdAt, updatedAt orderTicketStatusId, orderId, expressType, isStudent, transferStatus, status, payStatus,produceCode, createdAt, updatedAt
}; };
} }
......
...@@ -517,6 +517,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -517,6 +517,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS0); orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS0);
orderTicketStatus.setIsStudent(isStudent); orderTicketStatus.setIsStudent(isStudent);
orderTicketStatus.setPayStatus(KylinTableStatusConst.ORDER_PAY_STATUS0); orderTicketStatus.setPayStatus(KylinTableStatusConst.ORDER_PAY_STATUS0);
orderTicketStatus.setProduceCode(payOrderParam.getProductCode());
orderTicketStatus.setCreatedAt(now); orderTicketStatus.setCreatedAt(now);
orderTicketStatus.setUpdatedAt(null); orderTicketStatus.setUpdatedAt(null);
sqls.add(SqlMapping.get("kylin_order_ticket_status.add")); sqls.add(SqlMapping.get("kylin_order_ticket_status.add"));
......
...@@ -6,7 +6,7 @@ bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` ( `user_ ...@@ -6,7 +6,7 @@ bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` ( `user_
# ------------------------创建订单---------------------------- # ------------------------创建订单----------------------------
kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?) kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?)
kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?) kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_order_coupon.add=INSERT INTO kylin_order_coupons(order_id ,coupon_code ,coupon_type ,coupon_price,created_at,updated_at)VALUES(?,?,?,?,?,?) kylin_order_coupon.add=INSERT INTO kylin_order_coupons(order_id ,coupon_code ,coupon_type ,coupon_price,created_at,updated_at)VALUES(?,?,?,?,?,?)
# ------------------------再次支付---------------------------- # ------------------------再次支付----------------------------
......
...@@ -259,6 +259,8 @@ create index permission_id_index on slime_authorization_permissions (permission_ ...@@ -259,6 +259,8 @@ create index permission_id_index on slime_authorization_permissions (permission_
alter table kylin_ticket_status modify qr_code_show_time datetime default '2030-01-01 12:00:00' null comment '二维码显示时间'; alter table kylin_ticket_status modify qr_code_show_time datetime default '2030-01-01 12:00:00' null comment '二维码显示时间';
alter table kylin_tickets modify time_end_express datetime default '2030-01-01 12:00:00' null comment '快递票结束时间'; alter table kylin_tickets modify time_end_express datetime default '2030-01-01 12:00:00' null comment '快递票结束时间';
alter table kylin_performance_status ADD field_audit_status int default 0 null comment '场地审核状态[0-审核完成|1-待审核|2-已拒绝]'; alter table kylin_performance_status ADD field_audit_status int default 0 null comment '场地审核状态[0-审核完成|1-待审核|2-已拒绝]';
alter table kylin_order_ticket_status ADD produce_code varchar(64) default '' null comment '快递模板code';
drop table if exists kylin_ticket_express_module; drop table if exists kylin_ticket_express_module;
create table kylin_ticket_express_module create table kylin_ticket_express_module
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment