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

Commit 8ff0b231 authored by 胡佳晨's avatar 胡佳晨

修改 申请退票时间文案,增加配置阶梯时间超出可退款时间范围提示

parent 9a79fe6d
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
refundPoundageList[i].index = i refundPoundageList[i].index = i
dom += `<div class="ladder_items" id="ladder_items${i}" style="width: 100%; display: flex; align-items: center; margin-bottom: 12px;"> dom += `<div class="ladder_items" id="ladder_items${i}" style="width: 100%; display: flex; align-items: center; margin-bottom: 12px;">
<div class="" style="display: flex; align-items: center; margin-right: 12px; width: 260px;"> <div class="" style="display: flex; align-items: center; margin-right: 12px; width: 260px;">
<span class="control-label is-required" style="padding-top: 0px; width: 106px;">申请退票日期:</span> <span class="control-label is-required" style="padding-top: 0px; width: 106px;">截至退票时间:</span>
<input type="text" class="layui-input form-control test" id="test${i}" value="${refundPoundageList[i].day}" style="width: 154px"> <input type="text" class="layui-input form-control test" id="test${i}" value="${refundPoundageList[i].day}" style="width: 154px">
</div> </div>
<div class="" style="display: flex; align-items: center; margin-right: 12px; width: 202px;"> <div class="" style="display: flex; align-items: center; margin-right: 12px; width: 202px;">
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
let num = refundPoundageList.length let num = refundPoundageList.length
let dom = `<div class="ladder_items" id="ladder_items${num}" style="width: 100%; display: flex; align-items: center; margin-bottom: 12px;"> let dom = `<div class="ladder_items" id="ladder_items${num}" style="width: 100%; display: flex; align-items: center; margin-bottom: 12px;">
<div class="" style="display: flex; align-items: center; margin-right: 12px; width: 260px;"> <div class="" style="display: flex; align-items: center; margin-right: 12px; width: 260px;">
<span class="control-label is-required" style="padding-top: 0px; width: 106px;">申请退票日期:</span> <span class="control-label is-required" style="padding-top: 0px; width: 106px;">截至退票时间:</span>
<input type="text" class="layui-input form-control test" id="test${num}" value="" style="width: 154px"> <input type="text" class="layui-input form-control test" id="test${num}" value="" style="width: 154px">
</div> </div>
<div class="" style="display: flex; align-items: center; margin-right: 12px; width: 202px;"> <div class="" style="display: flex; align-items: center; margin-right: 12px; width: 202px;">
......
...@@ -772,6 +772,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -772,6 +772,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override @Override
public String setRefundPoundageAll(List<OrderRefundPoundage> orderRefundPoundageArrayList, String performanceId) { public String setRefundPoundageAll(List<OrderRefundPoundage> orderRefundPoundageArrayList, String performanceId) {
if (orderRefundPoundageArrayList.size() > 10) { if (orderRefundPoundageArrayList.size() > 10) {
return "阶梯不能大于10"; return "阶梯不能大于10";
} }
...@@ -785,7 +786,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -785,7 +786,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
if (count > 0) { if (count > 0) {
return "请先处理该演出待退款订单再进行操作"; return "请先处理该演出待退款订单再进行操作";
} }
LocalDateTime nextTime = LocalDateTime.parse("2001-01-01 12:00:00", DTF_YMD_HMS); LocalDateTime nextTime = LocalDateTime.parse("2001-01-01 12:00:00", DTF_YMD_HMS);
for (OrderRefundPoundage item : orderRefundPoundageArrayList) { for (OrderRefundPoundage item : orderRefundPoundageArrayList) {
if (item.getPresent().compareTo(BigDecimal.ONE) > 0) { if (item.getPresent().compareTo(BigDecimal.ONE) > 0) {
...@@ -797,6 +798,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma ...@@ -797,6 +798,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
} }
nextTime = curTime; nextTime = curTime;
} }
if (orderRefundPoundageArrayList.size() > 1) {
LocalDateTime st = LocalDateTime.parse(configVo.getRefundOpenTime(), DTF_YMD_HMS);
LocalDateTime et = LocalDateTime.parse(configVo.getRefundCloseTime(), DTF_YMD_HMS);
LocalDateTime ft = LocalDateTime.parse(orderRefundPoundageArrayList.get(0).getDay(), DTF_YMD_HMS);
LocalDateTime lt = LocalDateTime.parse(orderRefundPoundageArrayList.get(orderRefundPoundageArrayList.size() - 1).getDay(), DTF_YMD_HMS);
if (ft.isBefore(st)) {
return orderRefundPoundageArrayList.get(0).getDay() + "超出退款时间范围";
} else if (lt.isAfter(et)) {
return orderRefundPoundageArrayList.get(orderRefundPoundageArrayList.size() - 1).getDay() + "超出退款时间范围";
}
}
dataUtils.setRefundPoundage(orderRefundPoundageArrayList, performanceId); dataUtils.setRefundPoundage(orderRefundPoundageArrayList, performanceId);
return "操作成功"; return "操作成功";
} }
......
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