diff --git a/src/main/java/com/jmfy/controller/FindFlowController.java b/src/main/java/com/jmfy/controller/FindFlowController.java index b938d24..fec9410 100644 --- a/src/main/java/com/jmfy/controller/FindFlowController.java +++ b/src/main/java/com/jmfy/controller/FindFlowController.java @@ -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"; } // diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index 3c2fb2c..9e7aebb 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -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 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); diff --git a/src/main/resources/templates/findFlow.html b/src/main/resources/templates/findFlow.html index 132c1fe..5d558dd 100644 --- a/src/main/resources/templates/findFlow.html +++ b/src/main/resources/templates/findFlow.html @@ -38,7 +38,7 @@
- 流水日誌查询 + 流水日志查询
diff --git a/src/main/resources/templates/gameTitle.html b/src/main/resources/templates/gameTitle.html index 80ff4ee..1ad0804 100644 --- a/src/main/resources/templates/gameTitle.html +++ b/src/main/resources/templates/gameTitle.html @@ -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(); diff --git a/src/main/resources/templates/itemFlow.html b/src/main/resources/templates/itemFlow.html index d95a23e..d9e7517 100644 --- a/src/main/resources/templates/itemFlow.html +++ b/src/main/resources/templates/itemFlow.html @@ -21,17 +21,21 @@
-

道具流水日誌查询

+

道具流水日志查询

- + +