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

Skip to content

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

修改 快递票说明

parent d34ce2ad
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 34 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java
View file @ 7d4d4317
......@@ -43,7 +43,7 @@ public class TicketCreateParam implements Serializable {
private Integer isElectronic;
@ApiModelProperty(value = "是否电子票", example = "0")
private String describesExpress;
private String describeExpress;
@ApiModelProperty(value = "是否快递票", example = "0")
@NotNull(message = "不能为空")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 7d4d4317
......@@ -21,7 +21,8 @@
</li>
<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">库存预警</a>
</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 class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
</li>
......@@ -32,8 +33,9 @@
<div id="tab-1" class="tab-pane">
<div class="panel-body">
<div id="tab-1" class="tab-pane">
<!-- <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>
<!-- <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>
</div>
</div>
</div>
......@@ -140,14 +142,14 @@
<span>票种说明：</span>
<span th:text="${dict2.title}"></span>
</div>
<!-- <div>-->
<!-- <span>电子票说明：</span>-->
<!-- <span th:text="${dict2.describeElectronic}"></span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <span>快递票说明：</span>-->
<!-- <span th:text="${dict2.describesExpress}"></span>-->
<!-- </div>-->
<div th:if="${dict2.isElectronic==1}">
<span>电子票说明：</span>
<span th:text="${dict2.describeElectronic}"></span>
</div>
<div th:if="${dict2.isExpress==1}">
<span>快递票说明：</span>
<span th:text="${dict2.describeExpress}"></span>
</div>
<div th:if="${dict2.limitCount == 0}">
<span>限购：</span>
<span>不限购</span>
......@@ -160,17 +162,17 @@
<span>库存总量：</span>
<span th:text="${dict2.totalGeneral}"></span>
</div>
<!-- <div>-->
<!-- <span>售票状态：</span>-->
<!-- <span th:if="${dict2.status == 1}">审核中</span>-->
<!-- <span th:if="${dict2.status == 3}">审核通过</span>-->
<!-- <span th:if="${dict2.status == 4}">未通过</span>-->
<!-- <span th:if="${dict2.status == 6}">在售</span>-->
<!-- <span th:if="${dict2.status == 7}">下架</span>-->
<!-- <span th:if="${dict2.status == 8}">售罄</span>-->
<!-- <span th:if="${dict2.status == 9}">未开始</span>-->
<!-- <span th:if="${dict2.status == 10}">已结束</span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <span>售票状态：</span>-->
<!-- <span th:if="${dict2.status == 1}">审核中</span>-->
<!-- <span th:if="${dict2.status == 3}">审核通过</span>-->
<!-- <span th:if="${dict2.status == 4}">未通过</span>-->
<!-- <span th:if="${dict2.status == 6}">在售</span>-->
<!-- <span th:if="${dict2.status == 7}">下架</span>-->
<!-- <span th:if="${dict2.status == 8}">售罄</span>-->
<!-- <span th:if="${dict2.status == 9}">未开始</span>-->
<!-- <span th:if="${dict2.status == 10}">已结束</span>-->
<!-- </div>-->
<div>
<span>开始售票时间：</span>
<span th:text="${dict2.timeStart}"></span>
......@@ -218,17 +220,20 @@
</div>
<div id="tab-3" class="tab-pane">
<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 id="tab-4" class="tab-pane">
<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 id="tab-5" class="tab-pane">
<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>
......@@ -294,21 +299,21 @@
//会员详情
function memberInfo() {
document.getElementById("content_iframe").src="../memberInfo/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
document.getElementById("content_iframe").src = "../memberInfo/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
}
//代理详情
function agentInfo() {
document.getElementById("agent_iframe").src="../agent/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
document.getElementById("agent_iframe").src = "../agent/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
}
//大麦详情
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_iframe_1").attr("src",prefix + "/performanceStatic/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
$("#tab-nav-1").bind("click", function () {
$("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
});
</script>
</body>
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 7d4d4317
......@@ -112,7 +112,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setStatus(0);
kylinTicketPartnerVo.setDefault();
if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
} else {
kylinTicketPartnerVo.setDescribeExpress("");
}
......@@ -162,7 +162,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
} else {
kylinTicketPartnerVo.setDescribeExpress("");
}
......@@ -216,7 +216,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setTimesId(null);
kylinTicketPartnerVo.setStatus(null);
if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
}
if (ticketCreateParam.getIsElectronic() == 1) {
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