generated from root/miduo_server
cdk修改提交
parent
c9f9f25c86
commit
edb123bd7c
|
|
@ -1,6 +1,7 @@
|
|||
package com.jmfy.controller;
|
||||
|
||||
import com.jmfy.dao.CdkInfoDao;
|
||||
import com.jmfy.dao.ServerInfoDao;
|
||||
import com.jmfy.dao.UserInfoDao;
|
||||
import com.jmfy.dao.impl.GSUserDaoImpl;
|
||||
import com.jmfy.model.*;
|
||||
|
|
@ -31,7 +32,19 @@ public class CdkInfoController {
|
|||
private GSUserDaoImpl gsUserDao;
|
||||
@Resource
|
||||
private SeqUtils seqUtils;
|
||||
@Resource
|
||||
private ServerInfoDao serverInfoDao;
|
||||
|
||||
@RequestMapping(value = "/toAddCDKGoodsPage",method = RequestMethod.GET)
|
||||
public String toAddCDKGoodsPage(ModelMap map){
|
||||
try {
|
||||
List<ServerInfo> allServerInfo = serverInfoDao.getAllServerInfo();
|
||||
map.addAttribute("serverInfo",allServerInfo);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return "toAddCDKGoods";
|
||||
}
|
||||
/**
|
||||
* 生成序列号
|
||||
*/
|
||||
|
|
@ -58,6 +71,7 @@ public class CdkInfoController {
|
|||
cdkInfo.setId(id);
|
||||
cdkInfo.setGoodsId(goodsId);
|
||||
cdkInfo.setStatus(0);
|
||||
cdkInfo.setServerId(scdkInfo.getServerId());
|
||||
cdkInfoDao.addCdkInfo(cdkInfo);
|
||||
}
|
||||
//scdkInfo.setIsAdd(1);
|
||||
|
|
@ -116,6 +130,7 @@ public class CdkInfoController {
|
|||
cdkInfoVo.setType(String.valueOf(sCdkInfo.getUsetype()));
|
||||
cdkInfoVo.setPid(sCdkInfo.getPid());
|
||||
cdkInfoVo.setRoleUseNum(sCdkInfo.getRoleUseNum());
|
||||
cdkInfoVo.setServerId(sCdkInfo.getServerId());
|
||||
sCdkInfoListVo.add(cdkInfoVo);
|
||||
}
|
||||
map.put("sCdkInfoList",sCdkInfoListVo);
|
||||
|
|
@ -160,6 +175,7 @@ public class CdkInfoController {
|
|||
String endTime = JsonUtil.date3TimeStamp(parameterMap.get("endTime"));
|
||||
String goodsInfo = parameterMap.get("goodsInfo");
|
||||
String reward = JsonUtil.getInstence().getReward(request);
|
||||
String serverId = parameterMap.get("serverId");
|
||||
if (reward.isEmpty()){
|
||||
throw new Exception("item erro !!!");
|
||||
}
|
||||
|
|
@ -175,6 +191,7 @@ public class CdkInfoController {
|
|||
sCdkInfo.setIsAdd(0);
|
||||
sCdkInfo.setPid(Integer.parseInt(pid));
|
||||
sCdkInfo.setRoleUseNum(Integer.parseInt(roleUseNum));
|
||||
sCdkInfo.setServerId(Integer.parseInt(serverId));
|
||||
cdkInfoDao.addCDKGoodsInfo(sCdkInfo);
|
||||
return "redirect:/toCDKBuild";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ public class CdkInfo {
|
|||
@Field(value = "status")
|
||||
private int status; // 是否兑换 0:未兑换 1:已兑换
|
||||
|
||||
@Field(value = "serverId")
|
||||
private int serverId;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
|
@ -38,5 +41,13 @@ public class CdkInfo {
|
|||
public void setStatus(int status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public int getServerId() {
|
||||
return serverId;
|
||||
}
|
||||
|
||||
public void setServerId(int serverId) {
|
||||
this.serverId = serverId;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,9 @@ public class SCdkInfo {
|
|||
@Field(value = "isAdd")
|
||||
private int isAdd; // 1: 已生成过 ,0: 未生成过
|
||||
|
||||
@Field(value = "serverId")
|
||||
private int serverId;
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
|
@ -129,5 +132,13 @@ public class SCdkInfo {
|
|||
public void setRoleUseNum(int roleUseNum) {
|
||||
this.roleUseNum = roleUseNum;
|
||||
}
|
||||
|
||||
public int getServerId() {
|
||||
return serverId;
|
||||
}
|
||||
|
||||
public void setServerId(int serverId) {
|
||||
this.serverId = serverId;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ public class CDKInfoVo {
|
|||
|
||||
public int pid ; // pid
|
||||
|
||||
public int serverId;
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
|
@ -61,4 +63,12 @@ public class CDKInfoVo {
|
|||
public void setRoleUseNum(long roleUseNum) {
|
||||
this.roleUseNum = roleUseNum;
|
||||
}
|
||||
|
||||
public int getServerId() {
|
||||
return serverId;
|
||||
}
|
||||
|
||||
public void setServerId(int serverId) {
|
||||
this.serverId = serverId;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
<!--<th width="25"><input type="checkbox" name="" value=""/></th>-->
|
||||
<th width="200">礼包名称</th>
|
||||
<th width="200">礼包id</th>
|
||||
<th width="200">区服id</th>
|
||||
<th width="200">pid</th>
|
||||
<th width="200">礼包数量</th>
|
||||
<th width="200">开始时间</th>
|
||||
|
|
@ -50,6 +51,7 @@
|
|||
<!--<td><input type="checkbox" value="" name=""/></td>-->
|
||||
<td th:text="${obj.goodsName}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.id}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.serverId==0?'全服邮件':obj.serverId}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.pid}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.goodsNum}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.startTime}" style="text-align: center;"></td>
|
||||
|
|
|
|||
|
|
@ -84,12 +84,12 @@
|
|||
<div th: th:switch="${powersVo.CDKinfo}">
|
||||
<div th:case="0">
|
||||
<dl id="menu-CDK">
|
||||
<dt><i class="Hui-iconfont"></i>序列號管理<i class="Hui-iconfont menu_dropdown-arrow"></i></dt>
|
||||
<dt><i class="Hui-iconfont"></i>序列号管理<i class="Hui-iconfont menu_dropdown-arrow"></i></dt>
|
||||
<dd>
|
||||
<ul>
|
||||
<li><a data-href="/html/toAddCDKGoods.html" data-title="序列号礼包生成" href="javascript:void(0)">序列号礼包生成</a></li>
|
||||
<li><a data-href="toCDKBuild" data-title="序列號生成" href="javascript:void(0)">序列號生成</a></li>
|
||||
<li><a data-href="/html/findCDKInfo.html" data-title="序列號使用者查询" href="javascript:void(0)">序列號查询</a></li>
|
||||
<li><a data-href="toAddCDKGoodsPage" data-title="序列号礼包生成" href="javascript:void(0)">序列号礼包生成</a></li>
|
||||
<li><a data-href="toCDKBuild" data-title="序列号生成" href="javascript:void(0)">序列号生成</a></li>
|
||||
<li><a data-href="/html/findCDKInfo.html" data-title="序列号使用者查询" href="javascript:void(0)">序列号查询</a></li>
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<!--_meta 作为公共模版分离出去-->
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="renderer" content="webkit|ie-comp|ie-stand"/>
|
||||
|
|
@ -10,18 +10,18 @@
|
|||
<link rel="Bookmark" href="..//favicon.ico" />
|
||||
<link rel="Shortcut Icon" href="..//favicon.ico" />
|
||||
<!--[if lt IE 9]>
|
||||
<script type="text/javascript" src="../lib/html5shiv.js"></script>
|
||||
<script type="text/javascript" src="../lib/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" type="text/css" href="../h-ui/css/H-ui.min.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../h-ui.admin/css/H-ui.admin.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../lib/Hui-iconfont/1.0.8/iconfont.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../h-ui.admin/skin/default/skin.css" id="skin" />
|
||||
<link rel="stylesheet" type="text/css" href="../h-ui.admin/css/style.css" />
|
||||
<script type="text/javascript" src="../static/lib/html5shiv.js"></script>
|
||||
<script type="text/javascript" src="../static/lib/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" type="text/css" href="../static/h-ui/css/H-ui.min.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../static/h-ui.admin/css/H-ui.admin.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../static/lib/Hui-iconfont/1.0.8/iconfont.css" />
|
||||
<link rel="stylesheet" type="text/css" href="../static/h-ui.admin/skin/default/skin.css" id="skin" />
|
||||
<link rel="stylesheet" type="text/css" href="../static/h-ui.admin/css/style.css" />
|
||||
<!--[if IE 6]>
|
||||
<script type="text/javascript" src="../lib/DD_belatedPNG_0.0.8a-min.js" ></script>
|
||||
<script>DD_belatedPNG.fix('*');</script>
|
||||
<![endif]-->
|
||||
<script type="text/javascript" src="../static/lib/DD_belatedPNG_0.0.8a-min.js"></script>
|
||||
<script>DD_belatedPNG.fix('*');</script>
|
||||
<![endif]-->
|
||||
|
||||
<title>基本设置</title>
|
||||
</head>
|
||||
|
|
@ -50,6 +50,17 @@
|
|||
<span class="GOODSNAME"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row cl">
|
||||
<label class="form-label col-xs-4 col-sm-2">
|
||||
<span class="c-red">*</span>
|
||||
区服id:</label>
|
||||
<div class="formControls col-xs-8 col-sm-9">
|
||||
<select name="serverId" class="input-text" id="serverId"><!--下拉列表-->
|
||||
<option value="0" selected = "selected">所有区服</option>
|
||||
<option th:each="server:${serverInfo}" th:value="${server.server_id}" th:text="${server.server_id}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row cl">
|
||||
<label class="form-label col-xs-4 col-sm-2">
|
||||
<span class="c-red">*</span>
|
||||
|
|
@ -147,16 +158,16 @@
|
|||
|
||||
|
||||
<!--_footer 作为公共模版分离出去-->
|
||||
<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="../lib/layer/2.4/layer.js"></script>
|
||||
<script type="text/javascript" src="../h-ui/js/H-ui.min.js"></script>
|
||||
<script type="text/javascript" src="../h-ui.admin/js/H-ui.admin.js"></script> <!--/_footer 作为公共模版分离出去-->
|
||||
<script type="text/javascript" src="../static/lib/jquery/1.9.1/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="../static/lib/layer/2.4/layer.js"></script>
|
||||
<script type="text/javascript" src="../static/h-ui/js/H-ui.min.js"></script>
|
||||
<script type="text/javascript" src="../static/h-ui.admin/js/H-ui.admin.js"></script> <!--/_footer 作为公共模版分离出去-->
|
||||
|
||||
<!--请在下方写此页面业务相关的脚本-->
|
||||
<script type="text/javascript" src="../lib/My97DatePicker/4.8/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="../lib/jquery.validation/1.14.0/jquery.validate.js"></script>
|
||||
<script type="text/javascript" src="../lib/jquery.validation/1.14.0/validate-methods.js"></script>
|
||||
<script type="text/javascript" src="../lib/jquery.validation/1.14.0/messages_zh.js"></script>
|
||||
<script type="text/javascript" src="../static/lib/My97DatePicker/4.8/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="../static/lib/jquery.validation/1.14.0/jquery.validate.js"></script>
|
||||
<script type="text/javascript" src="../static/lib/jquery.validation/1.14.0/validate-methods.js"></script>
|
||||
<script type="text/javascript" src="../static/lib/jquery.validation/1.14.0/messages_zh.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
$('.skin-minimal input').iCheck({
|
||||
|
|
@ -213,6 +224,7 @@ function toaddCDKInfo() {
|
|||
var startTime = $("input[name='startTime']").val();
|
||||
var endTime = $("input[name='endTime']").val();
|
||||
var goodsInfo = $("input[name='goodsInfo']").val();
|
||||
var serverId = $("input[name='serverId']").val();
|
||||
var pid = $("input[name='pid']").val();
|
||||
|
||||
if (goodsName === '' || goodsName == null) {
|
||||
Loading…
Reference in New Issue