master
lvxinran 2020-09-11 11:48:40 +08:00
parent 61c58275a5
commit ca0d9acd4a
5 changed files with 17 additions and 11 deletions

View File

@ -65,7 +65,7 @@ public class FindFlowController {
itemFlowVo.setUserId(String.valueOf(moneyFlow.getUid()));
itemFlowVo.setServerId(serverId);
itemFlowVo.setTime(dateFormat.format(new Date(Long.valueOf(moneyFlow.getTime()))));
itemFlowVo.setItemName( FileCacheUtils.itemNameMap.get(moneyFlow.getItemId()));
itemFlowVo.setItemName(moneyFlow.getItemId()+"."+FileCacheUtils.itemNameMap.get(moneyFlow.getItemId()));
itemFlowVo.setReason( FileCacheUtils.itemFlowResson.get(moneyFlow.getReason()));
itemFlowVo.setAfterMoney(String.valueOf(moneyFlow.getItemTotalNum()));
itemFlowVo.setAddOrReduce(String.valueOf(moneyFlow.getType()));
@ -90,6 +90,7 @@ public class FindFlowController {
// itemFlowVoList.add(itemFlowVo);
// }
map.put("itemFlowVoList", itemFlowVoList);
map.put("itemNameMap",FileCacheUtils.itemNameMap);
return "itemFlow";
}
//

View File

@ -45,7 +45,7 @@ public class OrderInfoController {
private static final Logger LOGGER = LoggerFactory.getLogger(OrderInfoController.class);
@RequestMapping(value = "/getOrder", method = {RequestMethod.POST, RequestMethod.GET})
public String getSendMail(HttpSession session, HttpServletRequest request, ModelMap map ) throws Exception {
public String getOrder(HttpSession session, HttpServletRequest request, ModelMap map ) throws Exception {
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
long startTime = JsonUtil.getAppointTimeInXDay(Long.parseLong(JsonUtil.date3TimeStamp(request.getParameter("startTime"))), 0);
long endTime = JsonUtil.getAppointTimeInXDay(Long.parseLong(JsonUtil.date3TimeStamp(request.getParameter("endTime"))), 0);
@ -77,9 +77,10 @@ public class OrderInfoController {
if (userInfo!=null &&!accountid.equals(userInfo.getId())){
continue;
}
double amountDouble = Integer.parseInt(cgPayOrder.getAmount())/100D;
Corder corder = new Corder();
corder.setAccountid(accountid);
corder.setAmount(cgPayOrder.getAmount());
corder.setAmount(String.format("%.2f",amountDouble));
corder.setOrderNo(cgPayOrder.getOrderId());
String payTime = cgPayOrder.getDelivery_time();
corder.setPayTime(payTime);

View File

@ -38,7 +38,7 @@
<form class="form form-horizontal" id="form-article-add" action="/findFlow" method="get" onsubmit="return findFlow()">
<div id="tab-system" class="HuiTab">
<div class="tabBar cl">
<span>流水日查询</span>
<span>流水日查询</span>
</div>
<div class="tabCon">
<div class="row cl">

View File

@ -137,7 +137,7 @@
});
function gameTitle() {
var erroCode = $('.SERVERID');
var serverId = $("input[name='serverId']").val();
var serverId = $("#serverId").val();
var userIds = $("textarea[name='userIds']").val();
var type = document.getElementById("type").value;
var banTime = $("input[name='banTime']").val();

View File

@ -21,17 +21,21 @@
<body>
<nav class="breadcrumb">
<i class="Hui-iconfont">&#xe67f;</i> 首页
<span class="c-gray en">&gt;</span> 流水日管理
<span class="c-gray en">&gt;</span> 流水日查询
<span class="c-gray en">&gt;</span> 流水日管理
<span class="c-gray en">&gt;</span> 流水日查询
<a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px"
href="javascript:location.replace(location.href);" title="刷新">
<i class="Hui-iconfont">&#xe68f;</i></a>
</nav>
<div class="page-container" style="text-align: center">
<h2><span style="color:red;">道具流水日查询</span></h2>
<h2><span style="color:red;">道具流水日查询</span></h2>
<div style="height: 30px"></div>
<div class="text-c">
<input type="text" placeholder="物品名称" name="itemName" value="" class="input-text" style="width:120px">
<!--<input type="text" placeholder="物品名称" name="itemName" value="" class="input-text" style="width:120px">-->
<select name="itemId" style="width: 150px" th:id="itemId"><!--下拉列表-->
<option value="0" selected = "selected">0.所有</option>
<option th:each="item:${itemNameMap}" th:value="${item.key}" th:text="${item.key}+.+${item.value}"></option>
</select>
<span class="btn-upload form-group">
</span> <span class="select-box" style="width:150px">
<select class="select" id="type" size="1">
@ -148,7 +152,7 @@ $('.table-sort').dataTable({
}
function onSearch(){
var itemName = $("input[name='itemName']").val();
var itemName = $("#itemId").find("option:selected").text();
var type = document.getElementById("type").value;
setTimeout(function(){
var storeId = document.getElementById('aa');
@ -156,7 +160,7 @@ function onSearch(){
for(var i=1;i<rowsLength;i++){
var itemText = storeId.rows[i].cells[4].innerHTML;
var typeText = storeId.rows[i].cells[8].innerHTML;
if(itemText === itemName && typeText === type){
if((itemName === "0.所有" || itemText === itemName ) && typeText === type){
storeId.rows[i].style.display='';//显示行操作,
}else{
storeId.rows[i].style.display='none';//隐藏行操作