From d6e4598d3f73d3b4c409e5dbc6eace8acbb93884 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 17 Sep 2020 15:43:06 +0800 Subject: [PATCH] =?UTF-8?q?gm=E7=89=A9=E5=93=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jmfy/controller/MailController.java | 4 ++-- src/main/java/com/jmfy/utils/JsonUtil.java | 12 ++++++++---- src/main/resources/templates/index.html | 4 ++-- src/main/resources/templates/userOrderInfo.html | 6 ++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index a51f02c..321bcba 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -200,7 +200,7 @@ public class MailController { for (int i = 0; i < serverMail.getItemNums().size(); i++) { itemNums[i]=String.valueOf(serverMail.getItemNums().get(i)); } - serverMailVo.setRewards(JsonUtil.getInstence().getReward(itemIds,itemNums)); + serverMailVo.setRewards(JsonUtil.getInstence().getReward(itemIds,itemNums,true)); sServerMailListVo.add(serverMailVo); } map.put("sServerMailListVo",sServerMailListVo); @@ -232,7 +232,7 @@ public class MailController { for (int i = 0; i < serverMail.getItemNums().size(); i++) { itemNums[i]=String.valueOf(serverMail.getItemNums().get(i)); } - serverMailVo.setRewards(JsonUtil.getInstence().getReward(itemIds,itemNums)); + serverMailVo.setRewards(JsonUtil.getInstence().getReward(itemIds,itemNums,true)); sServerMailListVo.add(serverMailVo); } map.put("sServerMailListVo",sServerMailListVo); diff --git a/src/main/java/com/jmfy/utils/JsonUtil.java b/src/main/java/com/jmfy/utils/JsonUtil.java index 43242c3..5b6d15c 100644 --- a/src/main/java/com/jmfy/utils/JsonUtil.java +++ b/src/main/java/com/jmfy/utils/JsonUtil.java @@ -49,11 +49,11 @@ public class JsonUtil { StringBuilder reward = new StringBuilder(); String[] itemIds = request.getParameterValues("itemIds[]"); String[] itemNums = request.getParameterValues("itemNums[]"); - return getReward(itemIds,itemNums); + return getReward(itemIds,itemNums,false); } - public String getReward(String[] itemIds,String[] itemNums) { + public String getReward(String[] itemIds,String[] itemNums,boolean isContent) { Map itemNameMap = FileCacheUtils.itemNameMap; StringBuilder reward = new StringBuilder(); @@ -64,10 +64,14 @@ public class JsonUtil { if (itemIds[i].isEmpty() || itemNums[i].isEmpty()){ return reward.toString(); } + String idContent = itemIds[i]; + if(isContent){ + idContent = itemNameMap.getOrDefault(Integer.parseInt(itemIds[i]),"错误"); + } if (reward.length() == 0){ - reward = new StringBuilder(itemNameMap.getOrDefault(Integer.parseInt(itemIds[i]),"错误") + "#" + itemNums[i]); + reward = new StringBuilder(idContent + "#" + itemNums[i]); }else{ - reward.append("、").append(itemNameMap.getOrDefault(Integer.parseInt(itemIds[i]),"错误")).append("#").append(itemNums[i]); + reward.append("|").append(idContent).append("#").append(itemNums[i]); } } return reward.toString(); diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f414ca1..dfd159a 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -132,8 +132,8 @@
流水日誌管理
diff --git a/src/main/resources/templates/userOrderInfo.html b/src/main/resources/templates/userOrderInfo.html index 19aaa8f..45864e8 100644 --- a/src/main/resources/templates/userOrderInfo.html +++ b/src/main/resources/templates/userOrderInfo.html @@ -38,11 +38,14 @@ 服务器id 用户id 礼包id + 礼包名称 + 礼包内容 充值金额 支付方式 注册时间 + @@ -53,9 +56,12 @@ + + +