商户管理

src/main/java/com/minpay/huicai/personmanage/action/DepartmentManageAction.java

@@ -61,7 +61,6 @@ public class DepartmentManageAction implements IMINAction {
 	 * 查询当前操作员所属机构以及下属机构信息
 	 * @param page
 	 * @param limit
-	 * @param branchLevel
 	 * @param branchId
 	 * @param branchName
 	 * @param branchStatus
@@ -72,12 +71,11 @@ public class DepartmentManageAction implements IMINAction {
 	public MINActionResult branchQueryAll(
 			@MINParam(key = "page", defaultValue = "1") int page,
 			@MINParam(key = "limit", defaultValue = "3") int limit,
-			@MINParam(key = "branchLevel") String[] branchLevel,
 			@MINParam(key = "branchId") String branchId,
-			@MINParam(key = "type") String type,
 			@MINParam(key = "branchName") String branchName,
 			@MINParam(key = "branchStatus") String branchStatus,
-			@MINParam(key = "branchType") String branchType,
+			@MINParam(key = "person") String person,
+			@MINParam(key = "phone") String phone,
 			@MINParam(key = "bIds") String bIds,
 			MINSession session
 			) throws MINBusinessException {
@@ -97,7 +95,8 @@ public class DepartmentManageAction implements IMINAction {
 		map.put("branchId", branchId);
 		map.put("branchName", branchName);
 		map.put("branchStatus", branchStatus);
-		map.put("branchType", branchType);
+		map.put("person", person);
+		map.put("phone", phone);
 		List<Map<String, Object>> ls = null;
 		//如果操作员所属机构为系统机构则查询所有机构信息
 		if("88888888".equals(bId)){
@@ -192,18 +191,14 @@ public class DepartmentManageAction implements IMINAction {
 	}
 
 
-	
 	/**
-	 * 修改部门
+	 * 修改商户
 	 * @param fapResult
-	 * @param pointNo
-	 * @param pointName
-	 * @param pointPerson
-	 * @param personTlephone
-	 * @param remark
-	 * @param address
-	 * @param shortName
-	 * @param content
+	 * @param branchId
+	 * @param branchName
+	 * @param person
+	 * @param phone
+	 * @param desc
 	 * @param session
 	 * @return
 	 * @throws MINBusinessException
@@ -211,42 +206,48 @@ public class DepartmentManageAction implements IMINAction {
 	@MINAction(value = MODIFY_BRANCH)
 	public MINActionResult modifyBranch(
 			MINHttpServletRequestContext fapResult,
-			@MINParam(key ="branchId") String pointNo,
-			@MINParam(key ="pointName") String pointName,
-			@MINParam(key ="pointPerson") String pointPerson,
-			@MINParam(key ="personTlephone") String personTlephone,
-			@MINParam(key ="remark") String remark,
-			@MINParam(key ="address") String address,
-			@MINParam(key ="shortName") String shortName,
-			@MINParam(key ="content") String content, 
+			@MINParam(key ="branchId") String branchId,
+			@MINParam(key ="branchName") String branchName,
+			@MINParam(key ="person") String person,
+			@MINParam(key ="phone") String phone,
+			@MINParam(key ="desc") String desc,
 			MINSession session
 			) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		//检查部门名称
 		ImBranchExample ibe = new ImBranchExample();
-		ibe.createCriteria().andNameEqualTo(pointName).andIdNotEqualTo(pointNo);
+		ibe.createCriteria().andNameEqualTo(branchName).andIdNotEqualTo(branchId);
 		List<ImBranch> branchList = Service.lookup(IMINDataBaseService.class).selectByExample(ImBranchMapper.class, ibe);
 		if(branchList.size()>0){
-			throw new  BusinessCodeException("JINM0108");
+			throw  new MINBusinessException("商户名称已存在！");
 		}
 		ImBranch ib = new ImBranch();
-		
-		ib.setId(pointNo);
-		ib.setName(pointName); 
-		ib.setPhone(personTlephone); 
-		ib.setPerson(pointPerson);
-		ib.setDesc(remark);
-		ib.setShortname(shortName);
-		ib.setAddress(address);
+		ib.setId(branchId);
+		ib.setName(branchName);
+		ib.setPhone(phone);
+		ib.setPerson(person);
+		ib.setDesc(desc);
 		int i =  Service.lookup(IMINDataBaseService.class).updateByPrimaryKeySelective(ImBranchMapper.class, ib);
 		if(0==i){
 			throw  new MINBusinessException("插入数据时出现异常");
 		}
 		// 记录日志
-		String logInfo = "修改部门 ："+pointName+"，部门编号："+pointNo;
+		String logInfo = "修改商户 ："+branchName+"，商户编号："+branchId;
 		Service.lookup(ILogService.class).logging(session, logInfo);	
 		return res;
 	}
+
+	@MINValidator(value = MODIFY_BRANCH)
+	public MINActionResult modifyBranchValidator(
+			@MINParam(key ="branchId",regex = RegexUtil.NOT_NULL, error = "操作异常") String branchId,
+			@MINParam(key ="branchName",regex = RegexUtil.NOT_NULL,min = 0, max = 100, error = "商户名称不能1-100个字符") String branchName,
+			@MINParam(key ="person",regex = RegexUtil.NOT_NULL,min = 0, max = 100, error = "联系人不能超过1-30个字符") String person,
+			@MINParam(key ="phone", regex = RegexUtil.NOT_NULL,min = 0, max = 20, error = "联系方式不能超过1-20个字符") String phone,
+			@MINParam(key ="desc",max = 300, error = "描述不能超过300个字符") String desc,
+			MINSession session) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		return res;
+	}
 	
 	
 	/**
@@ -259,9 +260,13 @@ public class DepartmentManageAction implements IMINAction {
 	@MINAction(value = DELETE_BRANCH)
 	public MINActionResult deleteBranch(
 			@MINParam(key ="branchId") String branchId,
+			@MINParam(key ="state") String state,
 			MINSession session
 			) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
+		if(!"0".equals(state) && !"1".equals(state) && !"2".equals(state)){
+			throw  new MINBusinessException("数据异常");
+		}
 		//查询改部门下 有无操作员
 		ImUserExample example = new ImUserExample();
 		example.createCriteria().andBranchidEqualTo(branchId);
@@ -272,7 +277,7 @@ public class DepartmentManageAction implements IMINAction {
 		}else {
 			ImBranch ib = new ImBranch();
 			ib.setId(branchId);
-			ib.setStt(Constant.DEPT_STT_DEL);
+			ib.setStt(state);
 			int ret = Service.lookup(IMINDataBaseService.class).updateByPrimaryKeySelective(ImBranchMapper.class, ib);
 			 if(0 == ret){
 				throw  new MINBusinessException("更新数据时出现异常");
@@ -282,6 +287,15 @@ public class DepartmentManageAction implements IMINAction {
 		}
 		return res;
 	}
+
+	@MINValidator(value = DELETE_BRANCH)
+	public MINActionResult deleteBranchValidator(
+			@MINParam(key ="branchId",regex = RegexUtil.NOT_NULL, error = "数据异常") String branchId,
+			@MINParam(key ="state",regex = RegexUtil.NOT_NULL,error = "数据异常") String state,
+			MINSession session) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		return res;
+	}
 	/**
 	 * 查看该部门人员
 	 * @param branchId

src/main/resources/com/minpay/db/table/own/mapper/BranchManageMapper.xml

@@ -78,6 +78,12 @@
 	   <if test=" branchType !=null and branchType != ''">
 	   		and BRH_TYPE =  #{branchType,jdbcType=VARCHAR}
 	   </if>
+		<if test=" person !=null and person != ''">
+			and BRH_PERSON like  concat('%' , #{person,jdbcType=VARCHAR},'%')
+		</if>
+		<if test=" phone !=null and phone != ''">
+			and BRH_PHONE like  concat('%' , #{phone,jdbcType=VARCHAR},'%')
+		</if>
 	   GROUP BY BRH_ID
 	   ORDER BY BRH_ID desc
 	</select>

src/main/webapp/admin/departmentManage/addDepartment.html

@@ -59,7 +59,7 @@
 <script>
 	function testNewPage() {
 		// 打开新增页面
-		deleteTabPage('315002-01');
+		deleteTabPage('101003-01');
 	}
 	layui.use('form', function(){
 		var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
@@ -84,10 +84,6 @@
 				form.render();
 			},
 		});
-// 	    		//监听取消
-// 	      	$('#cancel').on('click', function(){
-//       	    	 parent.layer.close(parent.layer.index);
-//       	   	});
 	});
 
 	function renderForm(){

src/main/webapp/admin/departmentManage/departmentManage.html

@@ -26,6 +26,17 @@
 					<label class="f12-gray4">名称：</label>
 					<input onchange = "changeSelectCon(0,this,'inp')" lay-verify="branchName"   class="search-select" type="tel" name="branchName"  id ="branchName" value="" placeholder="请输入名称" />
 				</div>
+
+				<div class="layui-inline">
+					<label class="f12-gray4">联系人：</label>
+					<input onchange = "changeSelectCon(1,this,'inp')" lay-verify="person"   class="search-select" type="tel" name="person"  id ="person" value="" placeholder="请输入联系人" />
+				</div>
+
+				<div class="layui-inline">
+					<label class="f12-gray4">联系方式：</label>
+					<input onchange = "changeSelectCon(2,this,'inp')" lay-verify="phone"   class="search-select" type="tel" name="person"  id ="phone" value="" placeholder="请输入联系方式" />
+				</div>
+
 			</div>
 		</form>
 
@@ -37,16 +48,15 @@
     <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(isPermission('01000102')){}} 
-			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
-		{{# } }}
-     	
-   </script>
- 
-    <script type="text/html" id="checkboxDemo">
-     	<input type="checkbox"  {{ d.certtype =='1' ? 'checked' : '' }}>
+		{{#  if(d.stt == '0'){ }}
+		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="frozen">冻结</a>
+		{{#  }; }}
+		{{#  if(d.stt != '0'){ }}
+		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="enable">解冻</a>
+		{{#  }; }}
+		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+
    </script>
-   
 	<script>
      	var table;
      	layui.use('table', function(){
@@ -101,11 +111,12 @@
 			    if(layEvent === 'detail'){ //查看
 			    	showDetail(data);
 			    } else if(layEvent === 'del'){ //删除
-		    		layer.confirm('是否确定要删除该部门？', function(index){
+		    		layer.confirm('是否确定要删除该商户？', function(index){
 			    		$.request({
 							action : '../../DepartmentManageAction/deleteBranch',
 							data : {
-								branchId : branchId //用户名
+								branchId : branchId ,//用户名
+								state:'2'
 							},
 							success : function(data) {
 								location.reload(); //刷新页面
@@ -126,7 +137,58 @@
 		      		});
 			  	} else if(layEvent === 'edit'){ //编辑
 			    	editDetail(data);
-			  	}
+			  	}else if(layEvent === 'frozen'){ //冻结
+
+					layer.confirm('是否确定要删除该商户？', function(index){
+						$.request({
+							action : '../../DepartmentManageAction/deleteBranch',
+							data : {
+								branchId : branchId,//用户名
+								state:'1'
+							},
+							success : function(data) {
+								location.reload(); //刷新页面
+								layer.alert('操作成功!', {
+									icon: 6,
+									title: "提示"
+								});
+
+							},
+							error : function(data) {
+								layer.alert(data.MINErrorMessage, {
+									icon: 5,
+									title: "提示"
+								});
+							}
+						});
+						//向服务端发送删除指令
+					});
+				}else if(layEvent === 'enable'){ //解冻
+					layer.confirm('是否确定要删除该商户？', function(index){
+						$.request({
+							action : '../../DepartmentManageAction/deleteBranch',
+							data : {
+								branchId : branchId,//用户名
+								state :'0'
+							},
+							success : function(data) {
+								location.reload(); //刷新页面
+								layer.alert('操作成功!', {
+									icon: 6,
+									title: "提示"
+								});
+
+							},
+							error : function(data) {
+								layer.alert(data.MINErrorMessage, {
+									icon: 5,
+									title: "提示"
+								});
+							}
+						});
+						//向服务端发送删除指令
+					});
+				}
 		  	});
 			$('.demoTable .layui-btn').on('click', function(){
 				var type = $(this).data('type');
@@ -159,7 +221,10 @@
       	}
       	//编辑
       	function editDetail(data) {
-    	    var params = {};
+			// 寄存当前数据
+			layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
+			openMainTabPage('101003-02', ' 编辑商户信息', 'departmentManage/editDepartment.html', '', '101003', reLoadFun);
+    	    /*var params = {};
 	    	params.columnNumber = 2; //每行显示两个字段
 		    // 寄存当前数据
 		    layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
@@ -172,18 +237,23 @@
 	    	      //maxmin: true, //开启最大化最小化按钮
 	    	      area: ['75%', '85%'],
 	    	      content: 'editDepartment.html' ,
-	    	});
+	    	});*/
       	}
 		function reLoadFun() {
 			//单位名称
 			var branchName = $("#branchName").val();
+			var person = $("#person").val();
+			var phone = $("#phone").val();
+
 			//执行重载
 			table.reload('tableTest', {
 				page: {
 					curr: 1 //重新从第 1 页开始
 				}
 				,where: {
-					branchName : branchName
+					branchName : branchName,
+					person:person,
+					phone:phone
 				}
 			});
 		}
@@ -220,7 +290,7 @@
 				}
 			}
 		}
-		var array = new Array('名称');
+		var array = new Array('名称','联系人','联系方式');
 		function getSelectConHtml(index, t, type,dateValue){
 			var name;
 			var value;

src/main/webapp/admin/departmentManage/editDepartment.html

@@ -9,71 +9,59 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 </head>
 
-<body>
+<body class="content">
 
-    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-    </fieldset>
-	<div style="margin-top: 20px;margin-left: 20px;margin-right: 120px; padding-bottom:60px;">
-	    <form class="layui-form" action="javascript:void(0)">
-	     	<div class="layui-form-item" style="display: none">
-	            <label class="layui-form-label">部门ID:</label>
-	            <div class="layui-input-block">
-	                <input type="text" id = "editbranchId" name="branchId" lay-verify="title" autocomplete="off"class="layui-input" >
-	            </div>
-	        </div>
-	        
-	        <div class="layui-form-item">
-	            <label class="layui-form-label">*部门名称:</label>
-	            <div class="layui-input-block">
-	                <input type="text" id = "editbranchName" 
-	                 maxlength="100"
-	                name="pointName" lay-verify="title" autocomplete="off" placeholder="请输入名称" class="layui-input">
-	            </div>
-	        </div>
-        
-	        <div class="layui-form-item">
-	            <label class="layui-form-label">部门简称:</label>
-	            <div class="layui-input-block">
-	                <input type="text"  id = "editshortName"name="shortName" autocomplete="off" placeholder="请输入简称" class="layui-input">
-	            </div>
-	        </div>
-	          <div class="layui-form-item layui-form-text">
-	            <label class="layui-form-label">部门描述:</label>
-	            <div class="layui-input-block">
-	                <textarea name="remark" id = "editdesc"  placeholder="请输入内容" class="layui-textarea"></textarea>
-	            </div>
-	        </div>
-			<!-- <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">*联系人:</label>
-	                <div class="layui-input-inline">
-	                    <input  type="tel" name="pointPerson" id = "editperson" autocomplete="off" lay-verify="pointPerson" class="layui-input">
-	                </div>
-	            </div>
-	        </div>
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">*手机:</label>
-	                <div class="layui-input-inline">
-	                    <input type="tel" name="personTlephone" lay-verify="phone" id = "editphone" name="personTlephone"  autocomplete="off" class="layui-input">
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="layui-form-item">
-	            <label class="layui-form-label">部门地址:</label>
-	          <div class="layui-input-inline">
-	                <input type="tel" name="address" id = "editaddress" autocomplete="off" placeholder="" class="layui-input">
-	            </div>
-	        </div> -->
-	        <div class="layui-form-item box-button">
-	            <div class="layui-input-block">
-	                <button class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>
-	                <button onclick = "parent.layer.closeAll('iframe');" type="button" class="layui-btn layui-btn-primary">取消</button>
-	            </div>
-	        </div>
-	    </form>
-    </div>
+	<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+	</fieldset>
+	<form class="layui-form" action="javascript:void(0)">
+		<div style="padding-bottom:60px; ">
+			<div class="layui-form-item" style="display: none">
+				<label class="layui-form-label">部门ID:</label>
+				<div class="layui-input-block">
+					<input type="text" id = "editbranchId" name="branchId" lay-verify="title" autocomplete="off"class="layui-input" >
+				</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" name="branchName" id="editbranchName"  lay-verify="branchName" maxlength="20" autocomplete="off" placeholder="请输入商户名称" 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" name="person" id="editperson"  lay-verify="person" maxlength="20" autocomplete="off" placeholder="请输入联系人" 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" id = "editphone" name="phone" maxlength="20" lay-verify="phone"  maxlength="20" autocomplete="off" class="layui-input" placeholder="请输入联系方式"   >
+					</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 = "editdesc"  placeholder="请输入内容" class="layui-textarea"></textarea>
+				</div>
+			</div>
+
+			<div class="layui-form-item box-button" >
+				<div class="layui-input-block">
+					<button class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>
+					<button  class="layui-btn"  id="cancel" onclick = "testNewPage()">取消</button>
+				</div>
+			</div>
+		</div>
+	</form>
       <script src="../../js/min-loader-next.js"></script>
     <script>
     //反现
@@ -86,35 +74,23 @@
                 layer = layui.layer,
                 layedit = layui.layedit,
                 laydate = layui.laydate;
-
-            //日期
-            laydate.render({
-                elem: '#date'
-            });
-            laydate.render({
-                elem: '#date1'
-            });
-
-            //创建一个编辑器
-            var editIndex = layedit.build('LAY_demo_editor');
             //自定义验证规则
             form.verify({
-            	title: function(value, item) {
+				branchName: function(value, item) {
                     if (isEmpty(value)) {
-                        return '部门名称不能为空';
+                        return '商户名称不能为空';
                     }
-                    if(!new RegExp("^[a-zA-Z0-9_\u4e00-\u9fa5\\s·]+$").test(value)){
-                        return '部门名称不能有特殊字符';
-                      }
                 },
-                pointPerson : function(valueb, item) {
+                person : function(valueb, item) {
                     if (isEmpty(valueb)) {
                         return '联系人不能为空';
                     }
-                    if(!new RegExp("^[a-zA-Z0-9_\u4e00-\u9fa5\\s·]+$").test(valueb)){
-                        return '联系人不能有特殊字符';
-                     }
-                }
+                },
+				phone : function(valueb, item) {
+					if (isEmpty(valueb)) {
+						return '联系方式不能为空';
+					}
+				}
             });
     		//监听提交
             form.on('submit(demo1)', function(data) {
@@ -122,10 +98,9 @@
 					action : '../../DepartmentManageAction/modifyBranch',
 					data :  data.field ,
 					success : function(data) {
-						 layer.alert('操作成功!',  function(){
-							 window.parent.location.reload(); 
-			                 parent. layer.close(layer.index);  
-						}); 	
+						layer.alert('保存成功!',  function(){
+							deleteTabPage('101003-02');
+						});
 						 
 					},
 					error : function(data) {
@@ -139,6 +114,10 @@
             });
     
       });
+	function testNewPage() {
+		// 打开新增页面
+		deleteTabPage('101003-02');
+	}
     </script>
 
 </body>