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

Commit 2035ebe6 authored by 胡佳晨's avatar 胡佳晨

提交 大麦 同步演出 场次 票

parent 7842f89b
......@@ -68,7 +68,7 @@ CREATE TABLE `kylin_fields`
`district_id` int(11) NOT NULL DEFAULT 0 COMMENT '县id',
`district_name` varchar(255) NOT NULL DEFAULT '' COMMENT '县名称',
`refuse_message` varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_fields_uid_index` (`fields_id`),
......@@ -137,7 +137,7 @@ CREATE TABLE `kylin_performances`
`audit_time` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '提审时间',
`reject_txt` varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
`sort` int(11) NOT NULL DEFAULT 0 COMMENT '权重 高则在上',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performances_uid_index` (`performances_id`),
......@@ -200,7 +200,7 @@ CREATE TABLE `kylin_performance_distributions`
`first_agent_scale_barter` varchar(5) NOT NULL DEFAULT '0' COMMENT '2级积分奖励占比',
`second_agent_scale_money` varchar(5) NOT NULL DEFAULT '0' COMMENT '1级现金奖励占比',
`second_agent_scale_barter` varchar(5) NOT NULL DEFAULT '0' COMMENT '2级积分奖励占比',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performance_distributions_uid_index` (`performance_distributions_id`),
......@@ -220,7 +220,7 @@ CREATE TABLE `kylin_ticket_times`
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 0不可用 1可用',
`use_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
`use_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_times_uid_index` (`ticket_times_id`),
......@@ -266,7 +266,7 @@ CREATE TABLE `kylin_tickets`
`use_end` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用结束时间',
`pay_countdown_minute` int(11) NOT NULL DEFAULT 5 COMMENT '支付倒计时时间',
`sale_remind_minute` int(11) NOT NULL DEFAULT 60 COMMENT '开票提醒倒计时(分钟数)',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_tickets_uid_index` (`tickets_id`),
......@@ -332,7 +332,7 @@ CREATE TABLE `kylin_road_shows`
`title` varchar(255) NOT NULL DEFAULT '' COMMENT '封面图',
`img_poster` varchar(255) NOT NULL DEFAULT '' COMMENT '巡演封面图',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 0停用 1启用',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_road_shows_uid_index` (`road_shows_id`),
......@@ -372,7 +372,7 @@ CREATE TABLE `kylin_projects`
`open_performance` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启 推荐演出',
`open_goods` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启 推荐商品',
`open_tied` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启 推荐搭售',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL,
`updated_at` datetime NULL DEFAULT NULL,
KEY `kylin_projects_uid_index` (`projects_id`),
......@@ -440,7 +440,7 @@ CREATE TABLE `kylin_order_tickets`
`get_ticket_type` varchar(255) NOT NULL DEFAULT '' COMMENT '取票方式 电子票electronic快递票express',
`get_ticket_describe` varchar(255) NOT NULL DEFAULT '' COMMENT '直播用取票观演码,隔开',
`pay_countdown_minute` int(32) NOT NULL DEFAULT 15 COMMENT '订单过期时间(分钟)',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_tickets_uid_index` (`order_tickets_id`),
......@@ -506,7 +506,7 @@ CREATE TABLE `kylin_order_ticket_entities`
`sys_damai` int(11) NOT NULL DEFAULT 0 COMMENT '大麦同步状态: 0不同步 1待同步 2同步完成 3同步失败',
`check_client` varchar(255) NOT NULL DEFAULT '' COMMENT '出票端 例如 pda 验票app android/ios 大麦出票',
`is_payment` int(11) NOT NULL DEFAULT 0 COMMENT '支付状态: 0未支付 1已支付 2退款中 3已退款 ',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_ticket_entities_uid_index` (`order_ticket_entities_id`),
......
......@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
......@@ -300,16 +301,16 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
private ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList,Integer isStudent) {
LinkedList<String> sqls = new LinkedList<>();
LinkedList<Object[]> paramsList = new LinkedList<>();
String source = CurrentUtil.getCliSource();
String version = CurrentUtil.getCliVersion();
String source = CurrentUtil.getCliSource()==null?"":CurrentUtil.getCliSource();
String version = CurrentUtil.getCliVersion()==null?"":CurrentUtil.getCliVersion();
//生成订单 order_ticket
KylinOrderTickets orderTickets = new KylinOrderTickets();
String orderTicketId = IDGenerator.nextSnowId().toString();
orderTickets.setOrderTicketsId(orderTicketId);
orderTickets.setUserId(uid);
Map token = CurrentUtil.getTokenClaims();
orderTickets.setUserName((String) token.get("nickname"));
orderTickets.setUserMobile((String) token.get("mobile"));
orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")),""));
orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")),""));
orderTickets.setPerformanceTitle(performanceData.getTitle());
orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
orderTickets.setPayCode("");
......
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