游戏规则

src/main/java/com/minpay/shouhuo/GameSetupManageAction.java

@@ -66,6 +66,7 @@ public class GameSetupManageAction implements IMINAction {
 		MINActionResult res = new MINActionResult();
 		VmGameRuleExample vmGameRuleExample = new VmGameRuleExample();
 		VmGameRuleExample.Criteria createCriteria = vmGameRuleExample.createCriteria();
+		createCriteria.andStateNotEqualTo("2");
 		if(!StringUtils.isNullOrEmpty(name)){
 			createCriteria.andNameEqualTo(name);
 		}
@@ -93,7 +94,7 @@ public class GameSetupManageAction implements IMINAction {
 	public MINActionResult addGameSetup(
 			@MINParam(key = "name") String name,
 			@MINParam(key = "desc") String desc,
-			@MINParam(key = "alipayId") String alipayId,
+			@MINParam(key = "alipayid") String alipayid,
 			@MINParam(key = "type") String type,
 			@MINParam(key = "rewardGrade") String rewardGrade,
 			@MINParam(key = "rewardAmtRatio") String rewardAmtRatio,
@@ -135,7 +136,7 @@ public class GameSetupManageAction implements IMINAction {
 		vmGameRule.setName(name);
 		vmGameRule.setDesc(desc);
 		vmGameRule.setCreateTime(time);
-		vmGameRule.setAlipayid(alipayId);
+		vmGameRule.setAlipayid(alipayid);
 		vmGameRule.setCreateUser(user.getId());
 		vmGameRule.setType(type);
 		Service.lookup(IMINDataBaseService.class).insertSelective(VmGameRuleMapper.class, vmGameRule);
@@ -157,7 +158,6 @@ public class GameSetupManageAction implements IMINAction {
 	 * @param id
 	 * @param name
 	 * @param desc
-	 * @param alipayId
 	 * @param session
 	 * @return
 	 * @throws MINBusinessException
@@ -167,16 +167,37 @@ public class GameSetupManageAction implements IMINAction {
 			@MINParam(key = "id") String id,
 			@MINParam(key = "name") String name,
 			@MINParam(key = "desc") String desc,
-			@MINParam(key = "alipayId") String alipayId,
+			@MINParam(key = "alipayid") String alipayid,
+			@MINParam(key = "rewardGrade") String rewardGrade,
+			@MINParam(key = "rewardAmtRatio") String rewardAmtRatio,
+			@MINParam(key = "rewardType") String rewardType,
+			@MINParam(key = "jackpotAmt") String jackpotAmt,
+			@MINParam(key = "extractRatio") String extractRatio,
 			MINSession session
 			) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		if(!Constant.ADMINISTRATION_SYSTEM_NUMBER.equals(user.getBranchId())){
+			throw new MINBusinessException("此用户没有权限，此操作");
+		}
 		VmGameRule vmGameRule = new VmGameRule();
-		vmGameRule.setId(id);
+		vmGameRule.setRewardGrade(rewardGrade);
+		vmGameRule.setRewardAmtRatio(rewardAmtRatio);
 		vmGameRule.setName(name);
 		vmGameRule.setDesc(desc);
-		vmGameRule.setAlipayid(alipayId);
+		vmGameRule.setAlipayid(alipayid);
+		if("0".equals(rewardType)){
+			if(StringUtils.isNullOrEmpty(jackpotAmt)){
+				throw new MINBusinessException("奖池金额不能为空");
+			}
+			vmGameRule.setJackpotAmt(jackpotAmt);
+
+		}else  if("1".equals(rewardType)){
+			if(StringUtils.isNullOrEmpty(extractRatio)){
+				throw new MINBusinessException("抽取比例不能为空");
+			}
+			vmGameRule.setExtractRatio(extractRatio);
+		}
 		Service.lookup(IMINDataBaseService.class).updateByPrimaryKeySelective(VmGameRuleMapper.class, vmGameRule);
 		String logInfo = user.getName()+"-编辑游戏规则:" + id;
 		Service.lookup(ILogService.class).logging(session, logInfo);
@@ -202,21 +223,23 @@ public class GameSetupManageAction implements IMINAction {
 	@MINAction(value = DELETE_GAME_SETUP, transaction = IMINTransactionEnum.CMT)
 	public MINActionResult deleteGameSetup(
 			@MINParam(key = "id") String id,
+			@MINParam(key = "state") String state,
 			MINSession session
 			) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
 		VmGameRule vmGameRule = new VmGameRule();
 		vmGameRule.setId(id);
-		vmGameRule.setState("1");
+		vmGameRule.setState(state);
 		Service.lookup(IMINDataBaseService.class).updateByPrimaryKeySelective(VmGameRuleMapper.class, vmGameRule);
-		String logInfo = user.getName()+"-删除游戏规则:" + id;
+		String logInfo = user.getName()+"-编辑游戏规则状态:" + id+"状态："+state;
 		Service.lookup(ILogService.class).logging(session, logInfo);
 		return res;
 	}
 	@MINValidator(value = DELETE_GAME_SETUP)
 	public MINActionResult deleteGameSetupValidator(
 			@MINParam(key = "id",regex = RegexUtil.NOT_NULL, error = "数据异常") String id,
+			@MINParam(key = "state",regex = RegexUtil.NOT_NULL, error = "数据异常") String state,
 			MINSession session) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		return res;

src/main/webapp/admin/gameSetupManage/editSetupDetail.html

@@ -0,0 +1,176 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>增加游戏规则</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+</head>
+<script>
+</script>
+<body class="content">
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+</fieldset>
+<form class="layui-form" action="">
+	<div style="padding-bottom:60px; ">
+
+		<div class="layui-form-item">
+			<div class="layui-inline">
+				<label class="layui-form-label" style = "width: 150px;">*游戏名称:</label>
+				<div class="layui-input-inline">
+					<input type="tel"  readonly=" readonly" name="name" id = "name" maxlength="20" lay-verify="name"  placeholder="请输入游戏名称"autocomplete="off" class="layui-input">
+				</div>
+			</div>
+		</div>
+		<div class="layui-form-item layui-form-text">
+			<label class="layui-form-label">游戏规则说明:</label>
+			<div class="layui-input-block">
+				<textarea name="desc" id = "desc"  readonly=" readonly" placeholder="请输入游戏规则" class="layui-textarea"></textarea>
+			</div>
+		</div>
+		<div class="layui-form-item">
+			<div class="layui-inline">
+				<label class="layui-form-label" style = "width: 150px;">支付宝订单号:</label>
+				<div class="layui-input-inline">
+					<input type="tel" readonly=" readonly" name="alipayid" id = "alipayid" maxlength="20" lay-verify="alipayid"  placeholder="请输入支付宝订单号"autocomplete="off" class="layui-input">
+				</div>
+			</div>
+		</div>
+		<div class="layui-form-item">
+			<label class="layui-form-label">游戏类型</label>
+			<div class="layui-input-block">
+				<input type="radio" name="type" value="0" title="幸运购" checked="" lay-filter="type" >
+				<input type="radio" name="type" value="1" title="游戏购" lay-filter="type" >
+				<input type="radio" name="type" value="2" title="超级大彩蛋" lay-filter="type" >
+			</div>
+		</div>
+		<div style="display:none;" id="rewardGame">
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*彩蛋等级:</label>
+					<div class="layui-input-inline">
+						<input readonly=" readonly" type="tel" name="rewardGrade" id = "rewardGrade" maxlength="20" lay-verify="rewardGrade"  placeholder="请输入彩蛋等级"autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*中奖金额占比:</label>
+					<div class="layui-input-inline">
+						<input readonly=" readonly" type="tel" name="rewardAmtRatio" id = "rewardAmtRatio" maxlength="20" lay-verify="rewardAmtRatio"  placeholder="请输入中奖金额占比"autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">彩蛋奖池类型</label>
+				<div class="layui-input-block">
+					<input type="radio" name="rewardType" value="0" title="自定义奖池金额" checked=""  disabled>
+					<input type="radio" name="rewardType" value="1" title="按支付金额百分比抽取"  disabled>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*奖池金额:</label>
+					<div class="layui-input-inline">
+						<input readonly=" readonly" type="tel" name="jackpotAmt" id = "jackpotAmt" maxlength="20" lay-verify="jackpotAmt"  placeholder="请输入奖池金额"autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*抽取比例:</label>
+					<div class="layui-input-inline">
+						<input type="tel" readonly=" readonly" name="extractRatio" id = "extractRatio" maxlength="20" lay-verify="extractRatio"  placeholder="请输入抽取比例"autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+<script src="../../js/min-loader-next.js"></script>
+<script>
+	function testNewPage() {
+		// 打开新增页面
+		deleteTabPage('101006-01');
+	}
+	var rowData = layui.sessionData("ROW_DATA").NOW_ROW;
+	layui.each(rowData, function(index, item){
+
+		if(index =="type"){ //游戏类型
+
+
+			if(item == '0'){
+				$("#rewardGame").css("display","none");
+			}else if(item == '1'){
+				$("#rewardGame").css("display","none");
+			}else if(item == '2'){
+				$("#rewardGame").css("display","block");//显示div
+			}
+		}else{
+			$("#"+index+"").val(item);
+		}
+	})
+	function renderForm(){
+		layui.use('form', function(){
+			var form = layui.form();//高版本建议把括号去掉，有的低版本，需要加()
+			form.render();
+		});
+	}
+	layui.use(['form', 'layedit', 'laydate','layer'], function() {
+		var form = layui.form,
+				layer = layui.layer,
+				layedit = layui.layedit,
+				laydate = layui.laydate;
+
+		//自定义验证规则
+		form.verify({
+			name: function(value) {
+				if (isEmpty(value)) {
+					return   '游戏名称不能为空!';
+				}
+			},
+			type: function(value) {
+				if (isEmpty(value)) {
+					return   '游戏类型不能为空!';
+				}
+			}
+
+		});
+		//监听提交
+		form.on('submit(demo1)', function(data) {
+			alert(JSON.stringify(data.field));
+			$.request({
+				action : '../../GameSetupManageAction/addGameSetup',
+				data :  data.field ,
+				success : function(data) {
+					layer.alert('保存成功!',  function(){
+						deleteTabPage('101006-01');
+					});
+				},
+				error : function(data) {
+					layer.alert(data.MINErrorMessage, {
+						icon: 5,
+						title: "提示"
+					});
+				}
+			});
+			return false;
+		});
+
+		layui.form.on('radio(type)', function(data){
+			var value = data.value;
+			if(value == '0'){
+				$("#rewardGame").css("display","none");
+			}else if(value == '1'){
+				$("#rewardGame").css("display","none");
+			}else if(value == '2'){
+				$("#rewardGame").css("display","block");//显示div
+			}
+		})
+
+	});
+</script>
+</body>
+</html>

src/main/webapp/admin/gameSetupManage/gameSetupDetail.html

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>增加游戏规则</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+</head>
+<script>
+</script>
+<body class="content">
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+</fieldset>
+<form class="layui-form" action="">
+	<div style="padding-bottom:60px; ">
+
+		<div class="layui-form-item">
+			<div class="layui-inline">
+				<label class="layui-form-label" style = "width: 150px;">*游戏名称:</label>
+				<div class="layui-input-inline">
+					<input type="tel"  readonly=" readonly" name="name" id = "name" maxlength="20" lay-verify="name"  placeholder="请输入游戏名称"autocomplete="off" class="layui-input">
+				</div>
+			</div>
+		</div>
+		<div class="layui-form-item layui-form-text">
+			<label class="layui-form-label">游戏规则说明:</label>
+			<div class="layui-input-block">
+				<textarea name="desc" id = "desc"  readonly=" readonly" placeholder="请输入游戏规则" class="layui-textarea"></textarea>
+			</div>
+		</div>
+		<div class="layui-form-item">
+			<div class="layui-inline">
+				<label class="layui-form-label" style = "width: 150px;">支付宝订单号:</label>
+				<div class="layui-input-inline">
+					<input type="tel" readonly=" readonly" name="alipayid" id = "alipayid" maxlength="20" lay-verify="alipayid"  placeholder="请输入支付宝订单号"autocomplete="off" class="layui-input">
+				</div>
+			</div>
+		</div>
+		<div class="layui-form-item">
+			<label class="layui-form-label">游戏类型</label>
+			<div class="layui-input-block">
+				<input type="radio" name="type" value="0" title="幸运购" checked="" lay-filter="type" disabled>
+				<input type="radio" name="type" value="1" title="游戏购" lay-filter="type" disabled>
+				<input type="radio" name="type" value="2" title="超级大彩蛋" lay-filter="type" disabled>
+			</div>
+		</div>
+		<div style="display:none;" id="rewardGame">
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*彩蛋等级:</label>
+					<div class="layui-input-inline">
+						<input readonly=" readonly" type="tel" name="rewardGrade" id = "rewardGrade" maxlength="20" lay-verify="rewardGrade"  placeholder="请输入彩蛋等级"autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*中奖金额占比:</label>
+					<div class="layui-input-inline">
+						<input readonly=" readonly" type="tel" name="rewardAmtRatio" id = "rewardAmtRatio" maxlength="20" lay-verify="rewardAmtRatio"  placeholder="请输入中奖金额占比"autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">彩蛋奖池类型</label>
+				<div class="layui-input-block">
+					<input type="radio" name="rewardType" value="0" title="自定义奖池金额" checked="" disabled>
+					<input type="radio" name="rewardType" value="1" title="按支付金额百分比抽取" disabled>
+				</div>
+			</div>
+			<div class="layui-form-item" style="display:none;" id ="jackpotAmta">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*奖池金额:</label>
+					<div class="layui-input-inline">
+						<input readonly=" readonly" type="tel" name="jackpotAmt" id = "jackpotAmt" maxlength="20" lay-verify="jackpotAmt"  autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item" style="display:none;" id ="extractRatioa">
+				<div class="layui-inline">
+					<label class="layui-form-label" style = "width: 150px;">*抽取比例:</label>
+					<div class="layui-input-inline">
+						<input type="tel" readonly=" readonly" name="extractRatio" id = "extractRatio" maxlength="20" lay-verify="extractRatio"  autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+<script src="../../js/min-loader-next.js"></script>
+<script>
+	function testNewPage() {
+		// 打开新增页面
+		deleteTabPage('101006-01');
+	}
+	var rowData = layui.sessionData("ROW_DATA").NOW_ROW;
+	layui.each(rowData, function(index, item){
+
+		if(index =="type"){ //游戏类型
+
+			if(item == '0'){
+				$("#rewardGame").css("display","none");
+				$("[name='type']:eq(0)").prop("checked",true);
+			}else if(item == '1'){
+				$("#rewardGame").css("display","none");
+				$("[name='type']:eq(1)").prop("checked",true);
+			}else if(item == '2'){
+				$("#rewardGame").css("display","block");//显示div
+				$("[name='type']:eq(2)").prop("checked",true);
+			}
+
+		}if(index =="rewardType"){ //游戏类型
+			if(item == '0'){
+				$("[name='rewardType']:eq(0)").prop("checked",true);
+				$("#jackpotAmta").css("display","block");
+
+			}else if(item == '1'){
+				$("[name='rewardType']:eq(1)").prop("checked",true);
+				$("#extractRatioa").css("display","block");
+
+			}
+		}else{
+			$("#"+index+"").val(item);
+		}
+	})
+	function renderForm(){
+		layui.use('form', function(){
+			var form = layui.form();//高版本建议把括号去掉，有的低版本，需要加()
+			form.render();
+		});
+	}
+	layui.use(['form', 'layedit', 'laydate','layer'], function() {
+		var form = layui.form,
+				layer = layui.layer,
+				layedit = layui.layedit,
+				laydate = layui.laydate;
+
+	});
+</script>
+</body>
+</html>

src/main/webapp/admin/gameSetupManage/gameSetupManage.html

@@ -39,6 +39,13 @@
     <script type="text/html" id="barDemo">
       	<a class="layui-btn layui-btn-xs" lay-event="detail">查看</a>
      	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+		{{#  if(d.state == '0'){ }}
+		<a class="layui-btn layui-btn-xs" lay-event="stop">停用</a>
+		{{#  } }}
+		{{#  if(d.state == '1'){ }}
+		<a class="layui-btn layui-btn-xs" lay-event="enable">启用</a>
+		{{#  } }}
+		<a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
    </script>
 <script>
 	$("#toggle").click(function() {
@@ -72,7 +79,7 @@
 		      	,{field: 'desc', title: '游戏规则', width:'15%'}
 		      	,{field: 'stateDesc', title: '状态',width:'15%'}
 		      	,{field: 'rewardGrade', title: '彩蛋等级',width:'8%'}
-		      	,{field: 'operate', title: '操作', width: '25%', toolbar: '#barDemo',fixed: 'right'}
+		      	,{field: 'operate', title: '操作', width: '22%', toolbar: '#barDemo',fixed: 'right'}
 		    ]]
 		    ,done: function(res, curr, count){
 		        //如果是异步请求数据方式，res即为你接口返回的信息。
@@ -94,11 +101,12 @@
 		    if(layEvent == 'detail'){ //查看
 		    	showDetail(data);
 		    } else if(layEvent == 'del'){ //删除
-				layer.confirm('真的要注销吗', function(index){
+				layer.confirm('真的要删除吗', function(index){
 			    	$.request({
-						action : '../../gameSetupManageAction/userDelete',
+						action : 'GameSetupManageAction/deleteGameSetup',
 						data : {
-							id : id //用户名
+							id : id,//用户名
+							state : '2'
 						},
 						success : function(data) {
 							 //成功后刷新
@@ -119,48 +127,53 @@
 		      	});
 			} else if(layEvent == 'edit'){ //编辑
 				editDetail(data);
-			} else if(layEvent == 'esetLogin'){//重置登陆密码
-				layer.confirm('确定要重置密码吗?', function(index){
+			} else  if(layEvent =='enable'){
+				layer.confirm('真的要启用吗', function(index){
 					$.request({
-						action : '../../gameSetupManageAction/resetLoginPassword',
+						action : 'GameSetupManageAction/deleteGameSetup',
 						data : {
-							id : id //用户名
+							id : id,//用户名
+							state : '0'
 						},
 						success : function(data) {
-							 layer.alert('操作成功!', {
-									icon: 6,
-									title: "提示"
-							}); 	
+							//成功后刷新
+							var btn=$(".layui-laypage-btn")[0];
+							btn.click();
+							layer.alert('操作成功!', {
+								icon: 6,
+								title: "提示"
+							});
 						},
 						error : function(data) {
-							 layer.alert('操作失败!', {
+							layer.alert('操作失败!', {
 								icon: 5,
 								title: "提示"
-							}); 
+							});
 						}
 					});
 				});
-			}else if(layEvent =='enable'){
-				layer.confirm('确定要解冻吗?', function(index){
+			}else  if(layEvent =='stop'){
+				layer.confirm('真的要停用吗', function(index){
 					$.request({
-						action : '../../gameSetupManageAction/userThaw',
+						action : 'GameSetupManageAction/deleteGameSetup',
 						data : {
-							id : id,
-							state : '0'
+							id : id,//用户名
+							state : '1'
 						},
 						success : function(data) {
 							//成功后刷新
-							$(".layui-laypage-btn")[0].click();
-							 layer.alert('操作成功!', {
-									icon: 6,
-									title: "提示"
-							}); 	
+							var btn=$(".layui-laypage-btn")[0];
+							btn.click();
+							layer.alert('操作成功!', {
+								icon: 6,
+								title: "提示"
+							});
 						},
 						error : function(data) {
-							 layer.alert(data.MINErrorMessage, {
+							layer.alert('操作失败!', {
 								icon: 5,
 								title: "提示"
-							}); 
+							});
 						}
 					});
 				});
@@ -195,30 +208,9 @@
 	}
 	
 	function showDetail(data) {
-		var params = {};
-		params.columnNumber = 2; //每行显示两个字段
-	    	// 要显示的数据
-		params.fields = [
-           	   {field: 'id', title: 'ID'}
- 		      ,{field: 'logonname', title: '登录名'}
- 		      ,{field: 'name', title: '姓名'}
- 		      ,{field: 'rolename', title: '角色'}
- 		      ,{field: 'phone', title: '手机号'}
- 		      ,{field: 'createdate', title: '创建日期'}
- 		      ,{field: 'lastlogon', title: '最后登录日期'}
- 		      ,{field: 'sttdesc', title: '状态'}
-    	                 ]; 
 		// 寄存当前数据
-		setNowRowData(data, params);
-		layer.open({
-	   	      type: 2,
-	   	      title: '用户详情',
-	   	      shadeClose: true,
-	   	      shade: 0.8,
-	   	      //maxmin: true, //开启最大化最小化按钮
-	   	      area: ['800px', '500px'],
-	   	      content: '../../web/showDetail.html'
-		});
+		layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
+		openMainTabPage('101006-06', ' 查看', 'gameSetupManage/gameSetupDetail.html', '', '101006', reLoadFun);
 	}
 	//添加游戏规则
 	$(document).on('click','#addGameSetup',function(){