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

Commit b458be06 authored by 胡佳晨's avatar 胡佳晨

暂时提交一部分

parent decb0ea7
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
document.getElementById("li-tab-8").style.display = "none"; document.getElementById("li-tab-8").style.display = "none";
} }
if (auditStatus == 1 || fieldStatus == 1) { if (auditStatus == 1 || fieldStatus == 1 || auditStatus == 2) {
document.getElementsByName("auditBtn")[0].style.display = "none"; document.getElementsByName("auditBtn")[0].style.display = "none";
} }
......
...@@ -419,6 +419,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -419,6 +419,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
ticketData.setTimeStart(ticketItem.getTimeStart()); ticketData.setTimeStart(ticketItem.getTimeStart());
ticketData.setTimeEndExpress(ticketItem.getTimeEndExpress()); ticketData.setTimeEndExpress(ticketItem.getTimeEndExpress());
ticketData.setPrice(ticketItem.getPrice()); ticketData.setPrice(ticketItem.getPrice());
ticketData.setMemberPrice(ticketItem.getPrice());
ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes(kylinPerformanceMisVo.getPayCountdownMinute()))); ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes(kylinPerformanceMisVo.getPayCountdownMinute())));
ticketData.setTotalExchange(ticketItem.getTotalExchange()); ticketData.setTotalExchange(ticketItem.getTotalExchange());
ticketData.setTotalGeneral(ticketItem.getTotalGeneral()); ticketData.setTotalGeneral(ticketItem.getTotalGeneral());
......
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