generated from root/miduo_server
订单列表修改
parent
ba9b444473
commit
f5bae38b42
|
|
@ -79,8 +79,8 @@ public class OrderInfoController {
|
||||||
if(serverId1 != 0 && serverId1 != serverId) {
|
if(serverId1 != 0 && serverId1 != serverId) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
String ccId = cgPayOrder.getCc_id();
|
String ccId = Optional.ofNullable(cgPayOrder.getCc_id()).orElse("");
|
||||||
if (ccId != null && !ccId.equals(packId)){
|
if (!packId.equals("ALLORDER") && !ccId.equals(packId)){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
String accountid = cgPayOrder.getUserId();
|
String accountid = cgPayOrder.getUserId();
|
||||||
|
|
|
||||||
|
|
@ -75,6 +75,7 @@
|
||||||
游戏名称:</label>
|
游戏名称:</label>
|
||||||
<div class="formControls col-xs-8 col-sm-9">
|
<div class="formControls col-xs-8 col-sm-9">
|
||||||
<select name="packId" class="input-text" id="packId"><!--下拉列表-->
|
<select name="packId" class="input-text" id="packId"><!--下拉列表-->
|
||||||
|
<option th:value="ALLORDER" th:text="全部" selected="selected"></option>
|
||||||
<option th:each="pack:${channelPackInfo}" th:value="${pack.id}" th:text="${pack.name}"></option>
|
<option th:each="pack:${channelPackInfo}" th:value="${pack.id}" th:text="${pack.name}"></option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue