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

Skip to content

L
liquidnet-bus-v1
Commit 4fd784e0 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents e060c1ae fcf6228c
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 78 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java
View file @ 4fd784e0
...@@ -43,7 +43,7 @@ public class TicketCreateParam implements Serializable { ...@@ -43,7 +43,7 @@ public class TicketCreateParam implements Serializable {
private Integer isElectronic; private Integer isElectronic;
@ApiModelProperty(value = "是否电子票", example = "0") @ApiModelProperty(value = "是否电子票", example = "0")
private String describesExpress; private String describeExpress;
@ApiModelProperty(value = "是否快递票", example = "0") @ApiModelProperty(value = "是否快递票", example = "0")
@NotNull(message = "不能为空") @NotNull(message = "不能为空")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 4fd784e0
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
</li> </li>
<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">库存预警</a> <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">库存预警</a>
</li> </li>
<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a> <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false"
onclick="memberInfo()">会员信息配置</a>
</li> </li>
<li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a> <li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
</li> </li>
...@@ -32,8 +33,9 @@ ...@@ -32,8 +33,9 @@
<div id="tab-1" class="tab-pane"> <div id="tab-1" class="tab-pane">
<div class="panel-body"> <div class="panel-body">
<div id="tab-1" class="tab-pane"> <div id="tab-1" class="tab-pane">
<!-- <th:block th:include="../templates/zhengzai/kylin/performances/performancesStatic :: performancesStatic"/>--> <!-- <th:block th:include="../templates/zhengzai/kylin/performances/performancesStatic :: performancesStatic"/>-->
<iframe id="tab_iframe_1" name="tab_iframe_1" marginwidth=0 marginheight=0 width=100% height=800px frameborder=0></iframe> <iframe id="tab_iframe_1" name="tab_iframe_1" marginwidth=0 marginheight=0 width=100%
height=800px frameborder=0></iframe>
</div> </div>
</div> </div>
</div> </div>
...@@ -140,14 +142,14 @@ ...@@ -140,14 +142,14 @@
<span>票种说明：</span> <span>票种说明：</span>
<span th:text="${dict2.title}"></span> <span th:text="${dict2.title}"></span>
</div> </div>
<!-- <div>--> <div th:if="${dict2.isElectronic==1}">
<!-- <span>电子票说明：</span>--> <span>电子票说明：</span>
<!-- <span th:text="${dict2.describeElectronic}"></span>--> <span th:text="${dict2.describeElectronic}"></span>
<!-- </div>--> </div>
<!-- <div>--> <div th:if="${dict2.isExpress==1}">
<!-- <span>快递票说明：</span>--> <span>快递票说明：</span>
<!-- <span th:text="${dict2.describesExpress}"></span>--> <span th:text="${dict2.describeExpress}"></span>
<!-- </div>--> </div>
<div th:if="${dict2.limitCount == 0}"> <div th:if="${dict2.limitCount == 0}">
<span>限购：</span> <span>限购：</span>
<span>不限购</span> <span>不限购</span>
...@@ -160,17 +162,17 @@ ...@@ -160,17 +162,17 @@
<span>库存总量：</span> <span>库存总量：</span>
<span th:text="${dict2.totalGeneral}"></span> <span th:text="${dict2.totalGeneral}"></span>
</div> </div>
<!-- <div>--> <!-- <div>-->
<!-- <span>售票状态：</span>--> <!-- <span>售票状态：</span>-->
<!-- <span th:if="${dict2.status == 1}">审核中</span>--> <!-- <span th:if="${dict2.status == 1}">审核中</span>-->
<!-- <span th:if="${dict2.status == 3}">审核通过</span>--> <!-- <span th:if="${dict2.status == 3}">审核通过</span>-->
<!-- <span th:if="${dict2.status == 4}">未通过</span>--> <!-- <span th:if="${dict2.status == 4}">未通过</span>-->
<!-- <span th:if="${dict2.status == 6}">在售</span>--> <!-- <span th:if="${dict2.status == 6}">在售</span>-->
<!-- <span th:if="${dict2.status == 7}">下架</span>--> <!-- <span th:if="${dict2.status == 7}">下架</span>-->
<!-- <span th:if="${dict2.status == 8}">售罄</span>--> <!-- <span th:if="${dict2.status == 8}">售罄</span>-->
<!-- <span th:if="${dict2.status == 9}">未开始</span>--> <!-- <span th:if="${dict2.status == 9}">未开始</span>-->
<!-- <span th:if="${dict2.status == 10}">已结束</span>--> <!-- <span th:if="${dict2.status == 10}">已结束</span>-->
<!-- </div>--> <!-- </div>-->
<div> <div>
<span>开始售票时间：</span> <span>开始售票时间：</span>
<span th:text="${dict2.timeStart}"></span> <span th:text="${dict2.timeStart}"></span>
...@@ -218,17 +220,20 @@ ...@@ -218,17 +220,20 @@
</div> </div>
<div id="tab-3" class="tab-pane"> <div id="tab-3" class="tab-pane">
<div class="panel-body"> <div class="panel-body">
<iframe id="content_iframe" name="content_iframe" marginwidth=0 marginheight=0 width=100% height=800px frameborder=0></iframe> <iframe id="content_iframe" name="content_iframe" marginwidth=0 marginheight=0 width=100%
height=800px frameborder=0></iframe>
</div> </div>
</div> </div>
<div id="tab-4" class="tab-pane"> <div id="tab-4" class="tab-pane">
<div class="panel-body"> <div class="panel-body">
<iframe id="agent_iframe" name="agent_iframe" marginwidth=0 marginheight=0 width=100% height=800px frameborder=0></iframe> <iframe id="agent_iframe" name="agent_iframe" marginwidth=0 marginheight=0 width=100%
height=800px frameborder=0></iframe>
</div> </div>
</div> </div>
<div id="tab-5" class="tab-pane"> <div id="tab-5" class="tab-pane">
<div class="panel-body"> <div class="panel-body">
<iframe id="damai_iframe" name="damai_iframe" marginwidth=0 marginheight=0 width=100% height=800px frameborder=0></iframe> <iframe id="damai_iframe" name="damai_iframe" marginwidth=0 marginheight=0 width=100%
height=800px frameborder=0></iframe>
</div> </div>
</div> </div>
</div> </div>
...@@ -294,21 +299,21 @@ ...@@ -294,21 +299,21 @@
//会员详情 //会员详情
function memberInfo() { function memberInfo() {
document.getElementById("content_iframe").src="../memberInfo/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""); document.getElementById("content_iframe").src = "../memberInfo/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
} }
//代理详情 //代理详情
function agentInfo() { function agentInfo() {
document.getElementById("agent_iframe").src="../agent/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""); document.getElementById("agent_iframe").src = "../agent/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
} }
//大麦详情 //大麦详情
function damaiInfo() { function damaiInfo() {
document.getElementById("damai_iframe").src="../damai/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""); document.getElementById("damai_iframe").src = "../damai/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
} }
$("#tab-nav-1").bind("click",function(){ $("#tab-nav-1").bind("click", function () {
$("#tab_iframe_1").attr("src",prefix + "/performanceStatic/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "")); $("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
}); });
</script> </script>
</body> </body>
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 4fd784e0
...@@ -15,11 +15,16 @@ liquidnet: ...@@ -15,11 +15,16 @@ liquidnet:
username: testmall username: testmall
password: zhengzai!mYT password: zhengzai!mYT
rabbitmq: rabbitmq:
host: rabbitmq.zhengzai.tv # host: rabbitmq.zhengzai.tv
# port: 5672
# username: admin
# password: admin
# virtual-host: /
host: 101.201.127.58
port: 5672 port: 5672
username: admin username: admin
password: admin password: admin
virtual-host: / virtual-host: liquidnet
knife4j: knife4j:
disable: false disable: false
redis: redis:
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 4fd784e0
...@@ -15,10 +15,10 @@ liquidnet: ...@@ -15,10 +15,10 @@ liquidnet:
username: zhengzai username: zhengzai
password: $hAh4SGcDQ password: $hAh4SGcDQ
rabbitmq: rabbitmq:
host: amqp-cn-7pp26mhtn001.mq-amqp.cn-beijing-327844-a-internal.aliyuncs.com host: 101.201.127.58
port: 5672 port: 5672
username: MjphbXFwLWNuLTdwcDI2bWh0bjAwMTpMVEFJNXRGajR0UWplbW82NjRCcmtxS1o= username: admin
password: MzlENTBFRDE0NEE4MkM1RUE2MTc1RDhBMTVFNzhDQTNDQTQ3NEY4RDoxNjIyODE1ODU3ODEz password: admin
virtual-host: liquidnet virtual-host: liquidnet
knife4j: knife4j:
disable: false disable: false
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
View file @ 4fd784e0
...@@ -16,24 +16,10 @@ create table adam_third_party ...@@ -16,24 +16,10 @@ create table adam_third_party
comment text comment text
) engine = InnoDB comment '用户第三方账号信息'; ) engine = InnoDB comment '用户第三方账号信息';
create index idx_third_party_uid_platform on adam_third_party (uid, platform); create index idx_athird_party_uid_platform on adam_third_party (uid, platform);
create index idx_third_party_state on adam_third_party (state); create index idx_athird_party_state on adam_third_party (state);
# MDB.idx:uid,state create index idx_athird_party_open_id on adam_third_party (open_id);
-- >>------------------------------------------------------------------------------------ # MDB.idx:uid,open_id,platform,state
# drop table if exists adam_login;
# create table adam_login
# (
# mid int unsigned auto_increment primary key,
# mobile varchar(16),
# platform varchar(20) comment '平台名称',
# entrance varchar(20) comment '入口标记:Wechat、H5、App',
# source varchar(20) comment '来源终端',
# version varchar(20) comment '终端版本',
# client_ip varchar(20),
# client_area varchar(30),
# created_at datetime
# ) engine = InnoDB comment '登录记录';
# create index idx_login_mobile on adam_login (mobile);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
# drop table if exists adam_device_token; # drop table if exists adam_device_token;
# create table adam_device_token # create table adam_device_token
...@@ -49,7 +35,7 @@ create index idx_third_party_state on adam_third_party (state); ...@@ -49,7 +35,7 @@ create index idx_third_party_state on adam_third_party (state);
# comment text # comment text
# ) engine = InnoDB comment 'TOKEN'; # ) engine = InnoDB comment 'TOKEN';
# #
# create index idx_device_token_uid on adam_device_token (uid); # create index idx_adevice_token_uid on adam_device_token (uid);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_user; drop table if exists adam_user;
create table adam_user create table adam_user
...@@ -67,7 +53,9 @@ create table adam_user ...@@ -67,7 +53,9 @@ create table adam_user
comment text comment text
) ENGINE = InnoDB comment '用户'; ) ENGINE = InnoDB comment '用户';
create unique index uidx_user_uid on adam_user (uid); create unique index uidx_auser_uid on adam_user (uid);
create index idx_auser_mobile on adam_user (mobile);
# MDB.idx:uid,mobile,state
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_user_info; drop table if exists adam_user_info;
create table adam_user_info create table adam_user_info
...@@ -89,7 +77,7 @@ create table adam_user_info ...@@ -89,7 +77,7 @@ create table adam_user_info
comment text comment text
) engine = InnoDB comment '用户信息'; ) engine = InnoDB comment '用户信息';
create unique index idx_user_info_uid on adam_user_info (uid); create unique index idx_auser_info_uid on adam_user_info (uid);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_real_name; drop table if exists adam_real_name;
create table adam_real_name create table adam_real_name
...@@ -106,17 +94,16 @@ create table adam_real_name ...@@ -106,17 +94,16 @@ create table adam_real_name
comment text comment text
) engine = InnoDB comment '实名信息'; ) engine = InnoDB comment '实名信息';
create unique index idx_real_name_id on adam_real_name (real_name_id); create unique index idx_areal_name_id on adam_real_name (real_name_id);
create index idx_real_name_id_card_type on adam_real_name (id_card, type); create index idx_areal_name_id_card_type on adam_real_name (id_card, type);
create index idx_real_name_uid on adam_real_name (uid); create index idx_areal_name_uid on adam_real_name (uid);
create index idx_real_name_state on adam_real_name (state); create index idx_areal_name_state on adam_real_name (state);
# MDB.idx:uid,state # MDB.idx:uid,state
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_enters; drop table if exists adam_enters;
create table adam_enters create table adam_enters
( (
mid bigint unsigned auto_increment primary key, mid bigint unsigned auto_increment primary key,
# `user_id` int(11) NOT NULL DEFAULT '0' COMMENT '用户id',
enters_id varchar(64) not null, enters_id varchar(64) not null,
uid varchar(64) not null comment '用户id', uid varchar(64) not null comment '用户id',
type tinyint not null default '1' comment '1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证', type tinyint not null default '1' comment '1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证',
...@@ -124,7 +111,6 @@ create table adam_enters ...@@ -124,7 +111,6 @@ create table adam_enters
mobile varchar(20) not null default '' comment '入场人手机号', mobile varchar(20) not null default '' comment '入场人手机号',
id_card varchar(20) not null default '' comment '入场人身份号码，或护照号码', id_card varchar(20) not null default '' comment '入场人身份号码，或护照号码',
is_default boolean not null default false comment '是否为默认:0-否,1-是，第一个入默认1', is_default boolean not null default false comment '是否为默认:0-否,1-是，第一个入默认1',
# is_certification enum ('yes','no') not null default 'no' comment '入场人的身份证号是否认证',
state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID', state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
created_at datetime(3) not null, created_at datetime(3) not null,
updated_at datetime(3), updated_at datetime(3),
...@@ -132,8 +118,9 @@ create table adam_enters ...@@ -132,8 +118,9 @@ create table adam_enters
comment text comment text
) engine = InnoDB comment ='入场人'; ) engine = InnoDB comment ='入场人';
create unique index uidx_enters_id on adam_enters (enters_id); create unique index uidx_aenters_id on adam_enters (enters_id);
create index idx_enters_uid on adam_enters (uid); create index idx_aenters_uid_state on adam_enters (uid, state);
# MDB.idx:uid,state
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_addresses; drop table if exists adam_addresses;
create table adam_addresses create table adam_addresses
...@@ -141,14 +128,13 @@ create table adam_addresses ...@@ -141,14 +128,13 @@ create table adam_addresses
mid bigint unsigned auto_increment not null primary key, mid bigint unsigned auto_increment not null primary key,
addresses_id varchar(64) not null, addresses_id varchar(64) not null,
uid varchar(64) not null, uid varchar(64) not null,
name varchar(30) not null comment '姓名', name varchar(120) not null comment '姓名',
phone varchar(30) not null comment '手机号', phone varchar(30) not null comment '手机号',
province varchar(30) not null comment '省份', province varchar(30) not null comment '省份',
city varchar(30) not null comment '城市', city varchar(50) not null comment '城市',
county varchar(30) not null comment '区县', county varchar(60) not null comment '区县',
address varchar(100) not null comment '详细地址', address varchar(750) not null comment '详细地址',
is_default boolean not null default false comment '是否为默认:0-否,1-是,第一个默认1', is_default boolean not null default false comment '是否为默认:0-否,1-是,第一个默认1',
# is_certification enum ('yes','no') not null default 'no' comment '入场人的身份证号是否认证',
state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID', state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
created_at datetime(3) not null, created_at datetime(3) not null,
updated_at datetime(3), updated_at datetime(3),
...@@ -156,8 +142,9 @@ create table adam_addresses ...@@ -156,8 +142,9 @@ create table adam_addresses
comment text comment text
) engine = InnoDB comment '收货地址'; ) engine = InnoDB comment '收货地址';
create unique index uidx_addresses_id on adam_addresses (addresses_id); create unique index uidx_aaddresses_id on adam_addresses (addresses_id);
create index idx_addresses_uid on adam_addresses (uid); create index idx_aaddresses_uid_state on adam_addresses (uid, state);
# MDB.idx:uid,state
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
# drop table if exists adam_feedback; # drop table if exists adam_feedback;
# create table adam_feedback # create table adam_feedback
...@@ -192,7 +179,10 @@ create table adam_collection ...@@ -192,7 +179,10 @@ create table adam_collection
comment text comment text
) engine = InnoDB comment '收藏'; ) engine = InnoDB comment '收藏';
create unique index uidx_collection_uid_content_id on adam_collection (uid, content_id); create index idx_acollection_uid on adam_collection (uid);
create index idx_acollection_content_id on adam_collection (content_id);
create index idx_acollection_state on adam_collection (state);
# MDB.idx:uid,state,content_id
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_disposed; drop table if exists adam_disposed;
create table adam_disposed create table adam_disposed
...@@ -206,8 +196,11 @@ create table adam_disposed ...@@ -206,8 +196,11 @@ create table adam_disposed
updated_at datetime(3), updated_at datetime(3),
comment text comment text
) engine = InnoDB comment '想去'; ) engine = InnoDB comment '想去';
create index idx_disposed_uid on adam_disposed (uid);
create index idx_disposed_content on adam_disposed (content_id); create index idx_adisposed_uid on adam_disposed (uid);
create index idx_adisposed_content_id on adam_disposed (content_id);
create index idx_adisposed_state on adam_disposed (state);
# MDB.idx:uid,state,content_id
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_member; drop table if exists adam_member;
create table adam_member create table adam_member
...@@ -235,6 +228,9 @@ create table adam_member ...@@ -235,6 +228,9 @@ create table adam_member
limitation int default 0 comment '限购数量，0不限购', limitation int default 0 comment '限购数量，0不限购',
comment text comment text
); );
create unique index uidx_amember_id on adam_member (member_id);
# MDB.idx:member_id,state
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_member_price; drop table if exists adam_member_price;
create table adam_member_price create table adam_member_price
...@@ -252,6 +248,10 @@ create table adam_member_price ...@@ -252,6 +248,10 @@ create table adam_member_price
updated_at datetime(3), updated_at datetime(3),
comment text comment text
); );
create unique index uidx_amember_price_id on adam_member_price (member_price_id);
create index idx_amember_price_member_id on adam_member_price (member_id);
# MDB.idx:member_id,state
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_member_order; drop table if exists adam_member_order;
create table adam_member_order create table adam_member_order
...@@ -280,6 +280,9 @@ create table adam_member_order ...@@ -280,6 +280,9 @@ create table adam_member_order
version varchar(20), version varchar(20),
comment text comment text
); );
create unique index uidx_amember_order_id on adam_member_order (order_no);
# MDB.idx:order_no
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_user_member; drop table if exists adam_user_member;
create table adam_user_member create table adam_user_member
...@@ -294,6 +297,10 @@ create table adam_user_member ...@@ -294,6 +297,10 @@ create table adam_user_member
updated_at datetime(3), updated_at datetime(3),
comment text comment text
); );
create index idx_auser_member_uid on adam_user_member (uid);
create index idx_auser_member_no on adam_user_member (member_no);
# MDB.idx:uid,member_no
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
drop table if exists adam_member_code; drop table if exists adam_member_code;
create table adam_member_code create table adam_member_code
...@@ -315,6 +322,9 @@ create table adam_member_code ...@@ -315,6 +322,9 @@ create table adam_member_code
use_at datetime(3) default null, use_at datetime(3) default null,
comment text comment text
); );
create unique index uidx_amember_code_id on adam_member_code (code);
# MDB.idx:code
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java
View file @ 4fd784e0
...@@ -39,6 +39,8 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -39,6 +39,8 @@ public class AdamDMAdminController extends AdamBaseController {
DMMemberOrderProcessor dmMemberOrderProcessor; DMMemberOrderProcessor dmMemberOrderProcessor;
@Autowired @Autowired
DMMemberCodeProcessor dmMemberCodeProcessor; DMMemberCodeProcessor dmMemberCodeProcessor;
@Autowired
DMCollectionProcessor dmCollectionProcessor;
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "user") @ApiOperation(value = "user")
...@@ -111,4 +113,12 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -111,4 +113,12 @@ public class AdamDMAdminController extends AdamBaseController {
dmMemberCodeProcessor.handler(); dmMemberCodeProcessor.handler();
return ResponseDto.success(); return ResponseDto.success();
} }
@ApiOperationSupport(order = 10)
@ApiOperation(value = "collect")
@GetMapping(value = {"collect"})
public ResponseDto<Object> dataMigrationForCollect() {
dmCollectionProcessor.handler();
return ResponseDto.success();
}
} }
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 4fd784e0
...@@ -112,7 +112,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -112,7 +112,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setStatus(0); kylinTicketPartnerVo.setStatus(0);
kylinTicketPartnerVo.setDefault(); kylinTicketPartnerVo.setDefault();
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
} else { } else {
kylinTicketPartnerVo.setDescribeExpress(""); kylinTicketPartnerVo.setDescribeExpress("");
} }
...@@ -162,7 +162,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -162,7 +162,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd()); kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType()); kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
} else { } else {
kylinTicketPartnerVo.setDescribeExpress(""); kylinTicketPartnerVo.setDescribeExpress("");
} }
...@@ -216,7 +216,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -216,7 +216,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setTimesId(null); kylinTicketPartnerVo.setTimesId(null);
kylinTicketPartnerVo.setStatus(null); kylinTicketPartnerVo.setStatus(null);
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
} }
if (ticketCreateParam.getIsElectronic() == 1) { if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
......
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