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

Skip to content

L
liquidnet-bus-v1
Commit 5e76394f authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev' into test

parents ed201ee6 05f4b446
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 40 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberInfo.html
View file @ 5e76394f
......@@ -149,12 +149,18 @@
"isExclusive": parseInt($("input[name^='isExclusive']:checked").val())
}
if ($.validate.form()) {
var canSubmit = 1;
$("#ticket-table").find('.content-tr').each(function (i, tr) {
$(tr).find('td').each(function (y, td) {
var inputName = $(td).find("input").attr("name");
var inputValue = $(td).find("input").val();
if (inputName == "priceDiscountMember") {//过滤修改列
performanceMemberAuditParam["ticketMemberAudit[" + i + "].priceDiscountMember"] = parseFloat(inputValue);
if (parseFloat($("td[name^='price']").text()) - parseFloat(inputValue) <= 0) {
canSubmit = 0;
}
}
if (inputName == "memberLimitCount") {//过滤修改列
performanceMemberAuditParam["ticketMemberAudit[" + i + "].memberLimitCount"] = parseInt(inputValue);
......@@ -168,9 +174,13 @@
});
});
$.operate.post(prefix + "/memberInfo/submit", performanceMemberAuditParam, function (res) {
location.reload();
});
if (canSubmit == 1) {
$.operate.post(prefix + "/memberInfo/submit", performanceMemberAuditParam, function (res) {
location.reload();
});
} else {
alert("会员优惠后不能小于0")
}
}
}
......@@ -193,4 +203,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java
View file @ 5e76394f
......@@ -153,6 +153,21 @@ public class KylinOrderTickets implements Serializable {
*/
private String expressAddress;
/**
* 城市
*/
private String city;
/**
* 区县
*/
private String county;
/**
* 省份
*/
private String province;
/**
* 收货人联系方式
*/
......
liquidnet-bus-service/liquidnet-service-consumer/src/main/resources/bootstrap-service-consumer.yml
View file @ 5e76394f
......@@ -9,9 +9,9 @@ eureka:
spring:
cloud:
config:
# uri: http://127.0.0.1:7002/support-config
# uri: http://39.106.122.201:7002/support-config
profile: ${liquidnet.cloudConfig.profile}
name: ${spring.application.name} #默认为spring.application.name
discovery:
enabled: true
service-id: liquidnet-support-config
\ No newline at end of file
service-id: liquidnet-support-config
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ 5e76394f
......@@ -26,7 +26,8 @@ CREATE TABLE `kylin_banners`
KEY `kylin_banners_banners_sort_index` (`banners_sort`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci
COMMENT '轮播图';
drop TABLE if exists `kylin_banners_relations`;
......@@ -43,7 +44,9 @@ CREATE TABLE `kylin_banners_relations`
KEY `kylin_banners_relations_banners_relations_id_index` (`banners_relations_id`),
KEY `kylin_banners_relations_banners_id_index` (`banners_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '轮播图 展示位置/推广省份 关联表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '轮播图 展示位置/推广省份 关联表';
-- 场地
drop TABLE if exists `kylin_fields`;
......@@ -72,7 +75,9 @@ CREATE TABLE `kylin_fields`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_fields_uid_index` (`fields_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '场地数据';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '场地数据';
-- 场地状态
drop TABLE if exists `kylin_field_status`;
CREATE TABLE `kylin_field_status`
......@@ -88,7 +93,9 @@ CREATE TABLE `kylin_field_status`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_field_status_uid_index` (`field_status_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '场地状态';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '场地状态';
-- 场地关联关系关系
drop TABLE if exists `kylin_field_relations`;
CREATE TABLE `kylin_field_relations`
......@@ -100,7 +107,9 @@ CREATE TABLE `kylin_field_relations`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_field_relations_uid_index` (`field_relations_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '场地关系';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '场地关系';
-- 演出
......@@ -138,7 +147,9 @@ CREATE TABLE `kylin_performances`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performances_uid_index` (`performances_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '演出';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '演出';
-- 演出状态
drop TABLE if exists `kylin_performance_status`;
CREATE TABLE `kylin_performance_status`
......@@ -171,7 +182,9 @@ CREATE TABLE `kylin_performance_status`
KEY `kylin_performances_status_is_true_name_index` (`is_true_name`),
KEY `kylin_performances_status_performance_id_index` (`performance_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '演出状态';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '演出状态';
-- 演出关联关系
drop TABLE if exists `kylin_performance_relations`;
CREATE TABLE `kylin_performance_relations`
......@@ -191,7 +204,9 @@ CREATE TABLE `kylin_performance_relations`
KEY `performance_relations_copy_id_index` (`copy_id`),
KEY `performance_relations_performance_id_index` (`performance_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '演出状态';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '演出状态';
# -- 演出退款比例表
# drop TABLE if exists `kylin_performance_refund_present`;
# CREATE TABLE `kylin_performance_refund_present`
......@@ -227,7 +242,9 @@ CREATE TABLE `kylin_performance_distributions`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performance_distributions_uid_index` (`performance_distributions_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '演出状态';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '演出状态';
-- 场次
......@@ -246,7 +263,9 @@ CREATE TABLE `kylin_ticket_times`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_times_uid_index` (`ticket_times_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '场次';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '场次';
-- 场次关联
drop TABLE if exists `kylin_ticket_time_relation`;
......@@ -262,7 +281,9 @@ CREATE TABLE `kylin_ticket_time_relation`
KEY `kylin_ticket_time_relation_times_id_index` (`times_id`),
KEY `kylin_ticket_time_relation_performance_id_index` (`performance_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '场次关联';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '场次关联';
-- 票
drop TABLE if exists `kylin_tickets`;
......@@ -292,7 +313,9 @@ CREATE TABLE `kylin_tickets`
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_tickets_uid_index` (`tickets_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '票';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '票';
-- 票状态
drop TABLE if exists `kylin_ticket_status`;
CREATE TABLE `kylin_ticket_status`
......@@ -331,7 +354,9 @@ CREATE TABLE `kylin_ticket_status`
KEY `kylin_ticket_status_is_exclusive_index` (`is_exclusive`),
KEY `kylin_ticket_status_is_true_name_index` (`is_true_name`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '票';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '票';
-- 票关系
drop TABLE if exists `kylin_ticket_relations`;
CREATE TABLE `kylin_ticket_relations`
......@@ -346,7 +371,9 @@ CREATE TABLE `kylin_ticket_relations`
KEY `ticket_relations_ticket_id_index` (`ticket_id`),
KEY `ticket_relations_times_id_index` (`times_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '票';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '票';
-- 巡演
drop TABLE if exists `kylin_road_shows`;
......@@ -363,7 +390,9 @@ CREATE TABLE `kylin_road_shows`
KEY `kylin_road_shows_uid_index` (`road_shows_id`),
KEY `ticket_relations_times_status_index` (`status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '巡演';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '巡演';
-- 缺票登记 记录
......@@ -386,7 +415,9 @@ CREATE TABLE `kylin_lack_registers`
KEY `kylin_lack_registers_ticket_id_index` (`ticket_id`),
KEY `kylin_lack_registers_user_id_index` (`user_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '缺票登记';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '缺票登记';
-- 专题 <搭售>
drop TABLE if exists `kylin_projects`;
......@@ -405,7 +436,9 @@ CREATE TABLE `kylin_projects`
`updated_at` datetime(3) NULL DEFAULT NULL,
KEY `kylin_projects_uid_index` (`projects_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '专题';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '专题';
-- 专题关系
drop TABLE if exists `kylin_project_relations`;
CREATE TABLE `kylin_project_relations`
......@@ -428,7 +461,9 @@ CREATE TABLE `kylin_project_relations`
KEY `kylin_project_relations_project_id_index` (`project_id`),
KEY `kylin_project_relations_target_id_index` (`target_id`),
KEY `kylin_project_relations_item_id_index` (`item_id`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '专题关系';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '专题关系';
-- 订单
......@@ -461,6 +496,9 @@ CREATE TABLE `kylin_order_tickets`
`time_pay` varchar(255) NULL DEFAULT '' COMMENT '支付时间',
`express_contacts` varchar(255) NOT NULL DEFAULT '' COMMENT '收货人',
`express_address` varchar(255) NOT NULL DEFAULT '' COMMENT '收货地址',
`province` varchar(60) NOT NULL DEFAULT '' COMMENT '省份',
`city` varchar(60) NOT NULL DEFAULT '' COMMENT '城市',
`county` varchar(60) NOT NULL DEFAULT '' COMMENT '区县',
`express_phone` varchar(255) NOT NULL DEFAULT '' COMMENT '收货人联系方式',
`coupon_type` varchar(255) NOT NULL DEFAULT '' COMMENT '券使用类别',
`get_ticket_type` varchar(255) NOT NULL DEFAULT '' COMMENT '取票方式 电子票electronic快递票express',
......@@ -474,7 +512,9 @@ CREATE TABLE `kylin_order_tickets`
KEY `kylin_order_tickets_order_code_index` (`order_code`),
KEY `kylin_order_tickets_order_type_index` (`order_type`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '订单';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '订单';
-- 订单关系
drop TABLE if exists `kylin_order_ticket_relations`;
CREATE TABLE `kylin_order_ticket_relations`
......@@ -499,7 +539,9 @@ CREATE TABLE `kylin_order_ticket_relations`
KEY `kylin_order_ticket_relations_agent_id_index` (`agent_id`),
KEY `kylin_order_ticket_relations_is_member_index` (`is_member`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '订单关系';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '订单关系';
-- 订单状态
drop TABLE if exists `kylin_order_ticket_status`;
CREATE TABLE `kylin_order_ticket_status`
......@@ -519,7 +561,9 @@ CREATE TABLE `kylin_order_ticket_status`
KEY `kylin_order_ticket_status_status_index` (`status`),
KEY `kylin_order_ticket_status_pay_status_index` (`pay_status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '订单状态';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '订单状态';
-- 订单详情
......@@ -551,7 +595,9 @@ CREATE TABLE `kylin_order_ticket_entities`
KEY `kylin_order_ticket_entities_user_id_index` (`user_id`),
KEY `kylin_order_ticket_entities_time_id_index` (`time_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '订单详情';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '订单详情';
-- 购票须知表
drop TABLE if exists `kylin_buy_notice`;
......@@ -569,7 +615,9 @@ CREATE TABLE `kylin_buy_notice`
KEY `kylin_buy_notice_uid_index` (`buy_notice_id`),
KEY `kylin_buy_notice_status_index` (`status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '购票须知表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '购票须知表';
-- 验票用户表
drop TABLE if exists `kylin_check_user`;
......@@ -588,7 +636,9 @@ CREATE TABLE `kylin_check_user`
KEY `kylin_check_user_mobile_index` (`mobile`),
KEY `kylin_check_user_pwd_index` (`pwd`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '验票用户表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '验票用户表';
-- 验票用户可看演出表
drop TABLE if exists `kylin_check_user_performances`;
......@@ -607,7 +657,9 @@ CREATE TABLE `kylin_check_user_performances`
KEY `kylin_check_user_check_user_id_index` (`check_user_id`),
KEY `kylin_check_user_status_index` (`status`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '验票用户可看演出表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '验票用户可看演出表';
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
......@@ -681,7 +733,9 @@ CREATE TABLE `kylin_order_refund_batches`
`updated_at` timestamp NULL DEFAULT NULL,
KEY `kylin_order_refund_batch_id_index` (`refund_batch_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '批量退款表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '批量退款表';
#订单退款表
drop TABLE if exists `kylin_order_refunds`;
......@@ -721,7 +775,9 @@ CREATE TABLE `kylin_order_refunds`
KEY `kylin_order_refunds_order_tickets_id_index` (`order_tickets_id`),
KEY `kylin_order_refunds_refund_type_index` (`refund_type`),
KEY `kylin_order_refunds_order_refunds_id_index` (`order_refunds_id`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT ='订单退款表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT ='订单退款表';
drop TABLE if exists `kylin_order_refund_entities`;
CREATE TABLE `kylin_order_refund_entities`
......@@ -735,7 +791,9 @@ CREATE TABLE `kylin_order_refund_entities`
`updated_at` timestamp NULL DEFAULT NULL,
KEY `kylin_order_refunds_entities_id_index` (`order_refunds_entities_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '退款入场人表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '退款入场人表';
drop TABLE if exists `kylin_order_express`;
CREATE TABLE `kylin_order_express`
......@@ -758,7 +816,9 @@ CREATE TABLE `kylin_order_express`
`updated_at` timestamp NULL DEFAULT NULL,
KEY `order_express_id_index` (`order_express_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '订单快递表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '订单快递表';
drop TABLE if exists `kylin_order_express_fee_info`;
CREATE TABLE `kylin_order_express_fee_info`
......@@ -799,10 +859,12 @@ CREATE TABLE `kylin_order_refund_pic`
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`refund_pic_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'refund_pic_id',
`order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单退款表id',
`pic_url` varchar(255) NOT NULL DEFAULT '' COMMENT '图片地址',
`pic_url` varchar(255) NOT NULL DEFAULT '' COMMENT '图片地址',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
KEY `kylin_refund_pic_refund_pic_id_index` (`refund_pic_id`),
KEY `kylin_refund_pic_order_refunds_id_index` (`order_refunds_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '订单退款图片表';
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci COMMENT '订单退款图片表';
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 5e76394f
......@@ -373,6 +373,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderTickets.setExpressContacts(addressesVo.getName());
orderTickets.setExpressAddress(addressesVo.getProvince() + addressesVo.getCity() + addressesVo.getCounty() + addressesVo.getAddress());
orderTickets.setExpressPhone(addressesVo.getPhone());
orderTickets.setCity(addressesVo.getCity());
orderTickets.setProvince(addressesVo.getProvince());
orderTickets.setCounty(addressesVo.getCounty());
orderTickets.setGetTicketType("express");
currentTime = System.currentTimeMillis() - currentTime;
log.debug("feign 获取入场人 -> time:" + (currentTime) + "毫秒");
......@@ -380,6 +383,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderTickets.setExpressContacts("");
orderTickets.setExpressAddress("");
orderTickets.setExpressPhone("");
orderTickets.setCity("");
orderTickets.setProvince("");
orderTickets.setCounty("");
orderTickets.setGetTicketType("electronic");
}
orderTickets.setCouponType("no");
......
liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml
View file @ 5e76394f
......@@ -18,10 +18,10 @@ liquidnet:
username: admin
password: admin
config:
# location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
location: /app/support-config
# location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
location: /app/support-config
# end-dev-这里是配置信息基本值
spring:
profiles:
include: support-config
\ No newline at end of file
include: support-config
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