generated from root/miduo_server
gm物品修改
parent
92a3291794
commit
d6e4598d3f
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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<Integer, String> 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();
|
||||
|
|
|
|||
|
|
@ -132,8 +132,8 @@
|
|||
<dt><i class="Hui-iconfont"></i> 流水日誌管理<i class="Hui-iconfont menu_dropdown-arrow"></i></dt>
|
||||
<dd>
|
||||
<ul>
|
||||
<li><a data-href="toFlowPage" data-title="流水日誌查询" href="javascript:;">流水日誌查询</a></li>
|
||||
<li><a data-href="toOrderPage" data-title="查询充值" href="javascript:;">查询充值</a></li>
|
||||
<li><a data-href="toFlowPage" data-title="道具日志" href="javascript:;">道具日志</a></li>
|
||||
<li><a data-href="toOrderPage" data-title="订单列表" href="javascript:;">订单列表</a></li>
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
|
|
|
|||
|
|
@ -38,11 +38,14 @@
|
|||
<th width="200">服务器id</th>
|
||||
<th width="200">用户id</th>
|
||||
<th width="200">礼包id</th>
|
||||
<th width="200">礼包名称</th>
|
||||
<th width="200">礼包内容</th>
|
||||
<th width="200">充值金额</th>
|
||||
<th width="200">支付方式</th>
|
||||
<th width="200">注册时间</th>
|
||||
|
||||
|
||||
|
||||
<!--<th width="240">操作</th>-->
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -53,9 +56,12 @@
|
|||
<td th:text="${obj.serverId}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.accountid}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.productid}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.productName}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.productContent}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.amount}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.recharge_type}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.registerTime}" style="text-align: center;"></td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
Loading…
Reference in New Issue