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

Skip to content

L
liquidnet-bus-v1
Commit 6b4ae519 authored by 张禹's avatar 张禹
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !290
parents 3fa77856 0f05234c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 9 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 6b4ae519
...@@ -92,9 +92,13 @@ ...@@ -92,9 +92,13 @@
<span th:if="*{isTrueName==0}">否</span> <span th:if="*{isTrueName==0}">否</span>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<label>演出限购：</label> <label>演出账号限购：</label>
<span th:text="*{limitCount}"></span> <span th:text="*{limitCount}"></span>
</div> </div>
<div class="panel-footer">
<label>演出实名限购：</label>
<span th:text="*{idCount}"></span>
</div>
<div class="panel-footer"> <div class="panel-footer">
<label>时间：</label> <label>时间：</label>
<span th:text="*{timeStart}"></span> <span th:text="*{timeStart}"></span>
...@@ -189,13 +193,23 @@ ...@@ -189,13 +193,23 @@
<span th:text="${dict2.describeExpress}"></span> <span th:text="${dict2.describeExpress}"></span>
</div> </div>
<div class="panel-footer" th:if="${dict2.limitCount == 0}"> <div class="panel-footer" th:if="${dict2.limitCount == 0}">
<span>限购：</span> <span>账号限购：</span>
<span>不限购</span> <span>账号不限购</span>
</div> </div>
<div class="panel-footer" th:if="${dict2.limitCount != 0}"> <div class="panel-footer" th:if="${dict2.limitCount != 0}">
<span>限购：</span> <span>账号限购：</span>
<span th:text="${dict2.limitCount}">不限购</span> <span th:text="${dict2.limitCount}">不限购</span>
</div> </div>
<div class="panel-footer" th:if="${dict2.idCount == 0}">
<span>实名限购：</span>
<span>实名不限购</span>
</div>
<div class="panel-footer" th:if="${dict2.idCount != 0}">
<span>实名限购：</span>
<span th:text="${dict2.idCount}">不限购</span>
</div>
<div class="panel-footer"> <div class="panel-footer">
<span>库存总量：</span> <span>库存总量：</span>
<span th:text="${dict2.totalGeneral}"></span> <span th:text="${dict2.totalGeneral}"></span>
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinMixAppServiceImpl.java
View file @ 6b4ae519
...@@ -102,12 +102,16 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService { ...@@ -102,12 +102,16 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
LocalDateTime nt = LocalDateTime.now(); LocalDateTime nt = LocalDateTime.now();
LocalDateTime st = LocalDateTime.parse(vo.getTimeStart(), DTF_YMD_HMS); LocalDateTime st = LocalDateTime.parse(vo.getTimeStart(), DTF_YMD_HMS);
LocalDateTime et = LocalDateTime.parse(vo.getTimeEnd(), DTF_YMD_HMS); LocalDateTime et = LocalDateTime.parse(vo.getTimeEnd(), DTF_YMD_HMS);
if (nt.isBefore(st)) { if (baseVo.getStatus() == 7) {
vo.setStatus(9); vo.setStatus(7);
} else if (nt.isAfter(et)) {
vo.setStatus(10);
} else { } else {
vo.setStatus(6); if (nt.isBefore(st)) {
vo.setStatus(9);
} else if (nt.isAfter(et)) {
vo.setStatus(10);
} else {
vo.setStatus(6);
}
} }
} }
return ResponseDto.success(vo); return ResponseDto.success(vo);
......
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