代码提交

src/main/java/com/minpay/db/table/mapper/VmAccountMapper.java

@@ -3,9 +3,8 @@ package com.minpay.db.table.mapper;
 import com.minpay.db.table.model.VmAccount;
 import com.minpay.db.table.model.VmAccountExample;
 import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface VmAccountMapper extends IMINMybatisEntityMapper<VmAccount, String, VmAccountExample> {
     /**

src/main/java/com/minpay/db/table/model/VmAccount.java

@@ -100,6 +100,14 @@ public class VmAccount extends AbstractMINBean {
     private String modifyTime;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_account.ACT_STATE
+     *
+     * @mbggenerated
+     */
+    private String state;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_account.ACT_ID
      *
@@ -386,4 +394,28 @@ public class VmAccount extends AbstractMINBean {
     public void setModifyTime(String modifyTime) {
         this.modifyTime = modifyTime == null ? null : modifyTime.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_account.ACT_STATE
+     *
+     * @return the value of vm_account.ACT_STATE
+     *
+     * @mbggenerated
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_account.ACT_STATE
+     *
+     * @param state the value for vm_account.ACT_STATE
+     *
+     * @mbggenerated
+     */
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmAccountExample.java

@@ -1125,6 +1125,84 @@ public class VmAccountExample {
             addCriterion("ACT_MODIFY_TIME not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andStateIsNull() {
+            addCriterion("ACT_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("ACT_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            if(value == null ){
+                andStateIsNull();
+            } else {
+                addCriterion("ACT_STATE =", value, "state");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            if(value == null ){
+                andStateIsNotNull();
+            } else {
+                addCriterion("ACT_STATE <>", value, "state");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("ACT_STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("ACT_STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("ACT_STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("ACT_STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("ACT_STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("ACT_STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("ACT_STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("ACT_STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("ACT_STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("ACT_STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/db/table/own/mapper/BusinessNumMapper.java

@@ -0,0 +1,12 @@
+package com.minpay.db.table.own.mapper;
+
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BusinessNumMapper extends  IMINMybatisEntityMapper{
+	//收款商户号信息查询
+	List<Map<String, Object>> querybusinessNum(Map<String, String> params, MINRowBounds rows);
+}

src/main/java/com/minpay/payManage/action/BusinessNumManageAction.java

@@ -0,0 +1,205 @@
+package com.minpay.payManage.action;
+
+import com.minpay.common.bean.User;
+import com.minpay.common.format.IFormatService;
+import com.minpay.common.service.ILogService;
+import com.minpay.common.service.IPublicService;
+import com.minpay.common.util.DateUtil;
+import com.minpay.db.table.mapper.ImUserMapper;
+import com.minpay.db.table.mapper.VmAccountMapper;
+import com.minpay.db.table.model.ImUser;
+import com.minpay.db.table.model.VmAccount;
+import com.minpay.db.table.own.mapper.BusinessNumMapper;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+import com.startup.minpay.frame.constant.IMINTransactionEnum;
+import com.startup.minpay.frame.data.format.MINCopyFormat;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import com.startup.minpay.frame.service.base.IMINDataBaseService;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.session.MINSession;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 收款商户号管理
+ * 
+ * @author weijg
+ * 2020-08-25 23:15
+ */
+
+@MINComponent
+public class BusinessNumManageAction implements IMINAction {
+
+	/** 收款商户号信息查询 */
+	public final static String TENCENTMANAGE_QUERY = "businessNumManageQuery";
+
+	/** 添加收款商户号 */
+	public final static String ADD_TENCENT			= "addbusinessNum";
+
+	/** 删除收款商户号 */
+	public final static String DELETE_TENCENT		= "deleteBusinessNum";
+
+	/** 修改收款商户号 */
+	public final static String MODIFY_TENCENT 		= "modifybusinessNum";
+
+	/**
+	 * 收款商户号信息查询
+	 * @param session
+	 * @param accountName			商户名称
+	 * @param accountId				商户号
+	 * @param type					商户类型
+	 * @param page
+	 * @param limit
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = TENCENTMANAGE_QUERY)
+	public MINActionResult businessNumManageQuery(MINSession session,
+//			@MINParam(key = "userId") String userId,
+			@MINParam(key = "accountName") String accountName,
+			@MINParam(key = "accountId") String accountId,
+			@MINParam(key = "type") String type,
+			@MINParam(key = "page", defaultValue = "1") int page,
+			@MINParam(key = "limit", defaultValue = "10") int limit) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		// 查询当前角色编号
+		User u = session.getUser();
+		String imUserId = u.getId();
+		ImUser user = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ImUserMapper.class)
+				.selectByPrimaryKey(imUserId);
+
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("accountName", accountName);
+		params.put("accountId", accountId);
+		params.put("type", type);
+
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		List<Map<String, Object>> businessNumList = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(BusinessNumMapper.class).querybusinessNum(params, rows);
+		businessNumList = new MINCopyFormat("{type:'typeDesc'}").format(businessNumList);
+		businessNumList = Service.lookup(IFormatService.class).formatEnum(businessNumList, "{typeDesc:'BUSINESSNUM_TYPE'}");
+		businessNumList = Service.lookup(IFormatService.class).formatDateTime(businessNumList, "createTime");
+
+		res.set(IMINBusinessConstant.F_PAGING_LAY, businessNumList);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
+
+		return res;
+	}
+
+
+	/**
+	 * 添加收款商户号
+	 * @param name			账户名称
+	 * @param type			账户类型
+	 * @param session
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = ADD_TENCENT,transaction = IMINTransactionEnum.CMT)
+	public MINActionResult addbusinessNum(
+			@MINParam(key = "name") String name,
+			@MINParam(key = "type") String type,
+			@MINParam(key = "number") String number,
+			MINSession session) throws MINBusinessException {
+
+		MINActionResult res = new MINActionResult();
+		//获取当前时间
+		String nowTime = DateUtil.getCurrentDateTimeString();
+		// 获取操作员信息
+		User user = session.getUser();
+		// 获取商品主键
+		String id = Service.lookup(IPublicService.class).getSequence("VM_ACT_ID");
+		VmAccount vti = new VmAccount();
+		vti.setId(id); 							// 账户ID
+		vti.setName(name); 						// 账户名称
+		vti.setUsrid(user.getId()); 			// 关联用户
+		vti.setType(type); 						// 账户类型
+		vti.setNumber(number); 					// 账号
+		vti.setChannel(user.getChannel()); 		// 渠道（V01:自助售货机）
+		vti.setCreateUser(user.getId()); 		// 创建人
+		vti.setCreateTime(nowTime); 			// 创建时间
+		vti.setModifyUser(user.getId());		// 修改人
+		vti.setModifyTime(nowTime);				// 修改时间
+		// 新增收款商户号信息,执行插入数据
+		Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmAccountMapper.class)
+				.insertSelective(vti);
+		// 记录操作日志
+		String logInfo = "操作员:" + user.getName() + "添加收款商户号，收款商户号编号:" + id;
+		Service.lookup(ILogService.class).logging(session, logInfo);
+		return res;
+	}
+
+	/**
+	 * 修改收款商户号
+	 * @param id			账户ID
+	 * @param name			账户名称
+	 * @param type			账户类型
+	 * @param number		三方账号
+	 * @param session
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = MODIFY_TENCENT, transaction = IMINTransactionEnum.CMT )
+	public MINActionResult modifybusinessNum(
+			@MINParam(key = "id")String id,
+			@MINParam(key = "name") String name,
+			@MINParam(key = "type") String type,
+			@MINParam(key = "number") String number,
+			MINSession session) throws MINBusinessException{
+
+		MINActionResult res = new MINActionResult();
+		//获取操作员信息
+		User user = session.getUser();
+		//获取当前时间
+		String dateTime = com.min.util.DateUtil.getCurrentDateTimeString();
+		VmAccount  vti = new VmAccount();
+		vti.setId(id); 							// 账户ID
+		vti.setName(name); 						// 账户名称
+		vti.setType(type); 						// 账户类型
+		vti.setNumber(number); 					// 账号
+		vti.setChannel(user.getChannel()); 		// 渠道（V01:自助售货机）
+		vti.setModifyUser(user.getId());		// 修改人
+		vti.setModifyTime(dateTime);			// 修改时间
+
+		//执行修改
+		Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmAccountMapper.class)
+				.updateByPrimaryKeySelective(vti);
+		//记录日志信息
+		String logInfo = "操作员:"+user.getName() +"修改收款商户号，名称:"+ name +",编号: "+ id;
+		Service.lookup(ILogService.class).logging(session, logInfo);
+		return res;
+	}
+
+	/**
+	 * 收款商户号删除
+	 * @param id
+	 * @param session
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = DELETE_TENCENT, session = true)
+	public MINActionResult deleteBusinessNum(
+			@MINParam(key = "id") String id,
+			MINSession session
+	) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		VmAccount ta = new VmAccount();
+		ta.setState("01"); //删除
+		ta.setId(id);
+		//更新数据
+		Service.lookup(IMINDataBaseService.class).updateByPrimaryKeySelective(VmAccountMapper.class, ta);
+		Service.lookup(ILogService.class).logging(session, "删除收款商户号id:" + id);
+		return res;
+	}
+
+}

src/main/resources/com/minpay/db/table/mapper/VmAccountMapper.xml

@@ -1,47 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.minpay.db.table.mapper.VmAccountMapper">
-  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmAccount">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.minpay.db.table.mapper.VmAccountMapper" >
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmAccount" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="ACT_ID" jdbcType="VARCHAR" property="id" />
-    <result column="ACT_CHANNEL" jdbcType="VARCHAR" property="channel" />
-    <result column="ACT_USRID" jdbcType="VARCHAR" property="usrid" />
-    <result column="ACT_TYPE" jdbcType="VARCHAR" property="type" />
-    <result column="ACT_NAME" jdbcType="VARCHAR" property="name" />
-    <result column="ACT_NUMBER" jdbcType="VARCHAR" property="number" />
-    <result column="ACT_AMT" jdbcType="VARCHAR" property="amt" />
-    <result column="ACT_AVA_AMT" jdbcType="VARCHAR" property="avaAmt" />
-    <result column="ACT_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
-    <result column="ACT_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
-    <result column="ACT_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
-    <result column="ACT_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <id column="ACT_ID" property="id" jdbcType="VARCHAR" />
+    <result column="ACT_CHANNEL" property="channel" jdbcType="VARCHAR" />
+    <result column="ACT_USRID" property="usrid" jdbcType="VARCHAR" />
+    <result column="ACT_TYPE" property="type" jdbcType="VARCHAR" />
+    <result column="ACT_NAME" property="name" jdbcType="VARCHAR" />
+    <result column="ACT_NUMBER" property="number" jdbcType="VARCHAR" />
+    <result column="ACT_AMT" property="amt" jdbcType="VARCHAR" />
+    <result column="ACT_AVA_AMT" property="avaAmt" jdbcType="VARCHAR" />
+    <result column="ACT_CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="ACT_CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="ACT_MODIFY_USER" property="modifyUser" jdbcType="VARCHAR" />
+    <result column="ACT_MODIFY_TIME" property="modifyTime" jdbcType="VARCHAR" />
+    <result column="ACT_STATE" property="state" jdbcType="VARCHAR" />
   </resultMap>
-  <sql id="Example_Where_Clause">
+  <sql id="Example_Where_Clause" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue">
+                <when test="criterion.singleValue" >
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue" >
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue">
+                <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
                     #{listItem}
                   </foreach>
                 </when>
@@ -52,29 +53,29 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause">
+  <sql id="Update_By_Example_Where_Clause" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue">
+                <when test="criterion.singleValue" >
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue" >
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue">
+                <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
                     #{listItem}
                   </foreach>
                 </when>
@@ -85,33 +86,33 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List">
+  <sql id="Base_Column_List" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     ACT_ID, ACT_CHANNEL, ACT_USRID, ACT_TYPE, ACT_NAME, ACT_NUMBER, ACT_AMT, ACT_AVA_AMT, 
-    ACT_CREATE_USER, ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME
+    ACT_CREATE_USER, ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME, ACT_STATE
   </sql>
-  <select id="selectByExample" parameterType="com.minpay.db.table.model.VmAccountExample" resultMap="BaseResultMap">
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.minpay.db.table.model.VmAccountExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select
-    <if test="distinct">
+    <if test="distinct" >
       distinct
     </if>
     <include refid="Base_Column_List" />
     from vm_account
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null">
+    <if test="orderByClause != null" >
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -121,7 +122,7 @@
     from vm_account
     where ACT_ID = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -129,17 +130,17 @@
     delete from vm_account
     where ACT_ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmAccountExample">
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmAccountExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from vm_account
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.minpay.db.table.model.VmAccount">
+  <insert id="insert" parameterType="com.minpay.db.table.model.VmAccount" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -147,156 +148,165 @@
     insert into vm_account (ACT_ID, ACT_CHANNEL, ACT_USRID, 
       ACT_TYPE, ACT_NAME, ACT_NUMBER, 
       ACT_AMT, ACT_AVA_AMT, ACT_CREATE_USER, 
-      ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME
-      )
+      ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME, 
+      ACT_STATE)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{usrid,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
       #{amt,jdbcType=VARCHAR}, #{avaAmt,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}
-      )
+      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
+      #{state,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmAccount">
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmAccount" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into vm_account
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
         ACT_ID,
       </if>
-      <if test="channel != null">
+      <if test="channel != null" >
         ACT_CHANNEL,
       </if>
-      <if test="usrid != null">
+      <if test="usrid != null" >
         ACT_USRID,
       </if>
-      <if test="type != null">
+      <if test="type != null" >
         ACT_TYPE,
       </if>
-      <if test="name != null">
+      <if test="name != null" >
         ACT_NAME,
       </if>
-      <if test="number != null">
+      <if test="number != null" >
         ACT_NUMBER,
       </if>
-      <if test="amt != null">
+      <if test="amt != null" >
         ACT_AMT,
       </if>
-      <if test="avaAmt != null">
+      <if test="avaAmt != null" >
         ACT_AVA_AMT,
       </if>
-      <if test="createUser != null">
+      <if test="createUser != null" >
         ACT_CREATE_USER,
       </if>
-      <if test="createTime != null">
+      <if test="createTime != null" >
         ACT_CREATE_TIME,
       </if>
-      <if test="modifyUser != null">
+      <if test="modifyUser != null" >
         ACT_MODIFY_USER,
       </if>
-      <if test="modifyTime != null">
+      <if test="modifyTime != null" >
         ACT_MODIFY_TIME,
       </if>
+      <if test="state != null" >
+        ACT_STATE,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="channel != null">
+      <if test="channel != null" >
         #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="usrid != null">
+      <if test="usrid != null" >
         #{usrid,jdbcType=VARCHAR},
       </if>
-      <if test="type != null">
+      <if test="type != null" >
         #{type,jdbcType=VARCHAR},
       </if>
-      <if test="name != null">
+      <if test="name != null" >
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="number != null">
+      <if test="number != null" >
         #{number,jdbcType=VARCHAR},
       </if>
-      <if test="amt != null">
+      <if test="amt != null" >
         #{amt,jdbcType=VARCHAR},
       </if>
-      <if test="avaAmt != null">
+      <if test="avaAmt != null" >
         #{avaAmt,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null">
+      <if test="createUser != null" >
         #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null">
+      <if test="createTime != null" >
         #{createTime,jdbcType=VARCHAR},
       </if>
-      <if test="modifyUser != null">
+      <if test="modifyUser != null" >
         #{modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null">
+      <if test="modifyTime != null" >
         #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.minpay.db.table.model.VmAccountExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.minpay.db.table.model.VmAccountExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from vm_account
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map">
+  <update id="updateByExampleSelective" parameterType="map" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update vm_account
-    <set>
-      <if test="record.id != null">
+    <set >
+      <if test="record.id != null" >
         ACT_ID = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.channel != null">
+      <if test="record.channel != null" >
         ACT_CHANNEL = #{record.channel,jdbcType=VARCHAR},
       </if>
-      <if test="record.usrid != null">
+      <if test="record.usrid != null" >
         ACT_USRID = #{record.usrid,jdbcType=VARCHAR},
       </if>
-      <if test="record.type != null">
+      <if test="record.type != null" >
         ACT_TYPE = #{record.type,jdbcType=VARCHAR},
       </if>
-      <if test="record.name != null">
+      <if test="record.name != null" >
         ACT_NAME = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.number != null">
+      <if test="record.number != null" >
         ACT_NUMBER = #{record.number,jdbcType=VARCHAR},
       </if>
-      <if test="record.amt != null">
+      <if test="record.amt != null" >
         ACT_AMT = #{record.amt,jdbcType=VARCHAR},
       </if>
-      <if test="record.avaAmt != null">
+      <if test="record.avaAmt != null" >
         ACT_AVA_AMT = #{record.avaAmt,jdbcType=VARCHAR},
       </if>
-      <if test="record.createUser != null">
+      <if test="record.createUser != null" >
         ACT_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.createTime != null">
+      <if test="record.createTime != null" >
         ACT_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       </if>
-      <if test="record.modifyUser != null">
+      <if test="record.modifyUser != null" >
         ACT_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.modifyTime != null">
+      <if test="record.modifyTime != null" >
         ACT_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.state != null" >
+        ACT_STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
     </set>
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map">
+  <update id="updateByExample" parameterType="map" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -313,55 +323,59 @@
       ACT_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       ACT_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       ACT_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
-      ACT_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR}
-    <if test="_parameter != null">
+      ACT_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      ACT_STATE = #{record.state,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmAccount">
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmAccount" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update vm_account
-    <set>
-      <if test="channel != null">
+    <set >
+      <if test="channel != null" >
         ACT_CHANNEL = #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="usrid != null">
+      <if test="usrid != null" >
         ACT_USRID = #{usrid,jdbcType=VARCHAR},
       </if>
-      <if test="type != null">
+      <if test="type != null" >
         ACT_TYPE = #{type,jdbcType=VARCHAR},
       </if>
-      <if test="name != null">
+      <if test="name != null" >
         ACT_NAME = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="number != null">
+      <if test="number != null" >
         ACT_NUMBER = #{number,jdbcType=VARCHAR},
       </if>
-      <if test="amt != null">
+      <if test="amt != null" >
         ACT_AMT = #{amt,jdbcType=VARCHAR},
       </if>
-      <if test="avaAmt != null">
+      <if test="avaAmt != null" >
         ACT_AVA_AMT = #{avaAmt,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null">
+      <if test="createUser != null" >
         ACT_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null">
+      <if test="createTime != null" >
         ACT_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       </if>
-      <if test="modifyUser != null">
+      <if test="modifyUser != null" >
         ACT_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null">
+      <if test="modifyTime != null" >
         ACT_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="state != null" >
+        ACT_STATE = #{state,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACT_ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmAccount">
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmAccount" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -377,7 +391,8 @@
       ACT_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       ACT_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       ACT_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
-      ACT_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR}
+      ACT_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      ACT_STATE = #{state,jdbcType=VARCHAR}
     where ACT_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.minpay.db.table.own.mapper.BusinessNumMapper">
+	<select id="querybusinessNum" resultType="hashmap" parameterType="java.util.Map">
+		SELECT
+		  vat.ACT_ID 			'accountId',
+		  vat.ACT_NAME 			'accountName',
+		  vat.ACT_TYPE 			'type',
+		  vat.ACT_NUMBER 		'number',
+		  vat.ACT_CREATE_TIME	'createTime'
+		FROM
+		vm_account vat
+		WHERE
+			vat.ACT_TYPE IN ('04', '05', '06')
+			and vat.ACT_STATE = "00"
+		<if test="accountName!=null  and accountName != ''">
+			and vat.ACT_NAME  =  #{accountName,jdbcType=VARCHAR}
+		</if>
+		<if test="accountId != null and accountId != ''">
+			AND vat.ACT_ID  = #{accountId,jdbcType=VARCHAR}
+		</if>
+		<if test="type != null and type != ''">
+			AND vat.ACT_TYPE  = #{type,jdbcType=VARCHAR}
+		</if>
+		ORDER BY vat.ACT_CREATE_TIME DESC
+		
+	</select>
+</mapper>

src/main/webapp/admin/businessNumManage/businessNumAdd.html

@@ -0,0 +1,119 @@
+<!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">
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+
+<body style="margin-top: 52px;">
+<form class="layui-form" id = "formName" >
+	<div style="margin-top: 20px;margin-left: 20px;margin-right: 120px; padding-bottom:60px;">
+        <div class="layui-form-item">
+            <label class="layui-form-label">商户类型</label>
+            <div class="layui-input-block">
+                <input type="radio" name="accountType" value="04" title="富友扫呗" checked="">
+                <input type="radio" name="accountType" value="05" title="合利宝" >
+                <input type="radio" name="accountType" value="06" title="收钱吧" >
+            </div>
+        </div>
+
+       <div class="layui-form-item">
+           <label class="layui-form-label">商户名称</label>
+           <div class="layui-input-block">
+               <input type="text" name="accountName" id="accountName" lay-verify="required" 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" name="number" id="number" lay-verify="required" autocomplete="off" placeholder="请输入终端号" class="layui-input">
+           </div>
+       </div>
+    </div>
+    </form>
+       <div class="layui-form-item box-button">
+           <div class="layui-input-block">
+	           	<button class="layui-btn" onclick = "addRole()">提交</button>
+	            <button class="layui-btn" onclick = "cancel()">取消</button>
+           </div>
+       </div>
+      <script src="../../js/min-loader-next.js"></script>
+<script>
+    layui.use('form', function () {
+        var form = layui.form;
+    });
+
+    // 新增角色按钮
+    function addRole(){
+        var itemid = "";
+        var number = document.getElementById('number').value;
+        var name = document.getElementById('accountName').value;
+        var type = $('input[name="accountType"]:checked').val();
+        if (isEmpty(number)) {
+            layui.use(['layer'], function(){
+                layer.alert('终端号不能为空！', {icon: 2});
+            })
+            return;
+        }
+        if (isEmpty(name)) {
+        	layui.use(['layer'], function(){
+        		layer.alert('商户名称不能为空！', {icon: 2});
+        	})
+        	return;
+        }
+
+        // 执行新增
+        $.request({
+            action : 'BusinessNumManageAction/addbusinessNum',
+            data : {
+                number : number,
+                name : name,
+                type : type
+            },
+            success : function(data){
+                if (data.MINStatus == 0) {
+                    layui.use(['layer'], function(){
+                        layer.msg('添加成功！', {
+                            icon: 1,
+                            time: 1000 //2秒关闭（如果不配置，默认是3秒）
+                        }, function(){
+                            // 关闭当前页面
+                            deleteTabPage('515001-01');
+                        });
+                    })
+                } else {
+                    layui.use(['layer'], function(){
+                        layer.alert(data.MINErrorMessage, {icon: 2});
+                    })
+                }
+            },
+            error : function(data) {
+                layui.use(['layer'], function(){
+                    layer.alert(data.MINErrorMessage, {icon: 2});
+                })
+            }
+        })
+    }
+    function checkAll(checked){
+        $('#tbody').find(':checkbox').each(function(){
+            $(this).prop('checked', checked);
+        });
+    }
+
+    //监听取消
+    function cancel() {
+        // 打开新增页面
+        deleteTabPage('515001-01');
+    }
+
+</script>
+<!-- 注意：如果你直接复制所有代码到本地，上述js路径需要改成你本地的 -->
+
+</body>
+
+</html>

src/main/webapp/admin/businessNumManage/businessNumManage.html

@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>商户号管理</title>
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+	<div class="order-body">
+	<div class="order-tiaojian back-gray">
+			<div class="tiaojian-part1" id = "conditions">
+				<div class="fl f12-gray4-op mt4">所选条件：</div>
+			</div>
+			<div class="tiaojian-part2 fr  demoTable">
+				<button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
+				<button class="layui-btn  order-bnt2" data-type="reset">重置</button>
+				<button class="layui-btn order-bnt2" id = "addBtn">新增商户号</button>
+				<a href="#" id="toggle" class="top">收起</a>
+			</div>
+		</div>
+		<form class="layui-form"  action="javascript:void(0)"  id = "formName">
+			<div class="order-select back-border" id="content">
+				<div class="layui-inline">
+					<label class="f12-gray4">商户名称：</label>
+					<input onchange = "changeSelectCon(0,this,'inp')"  class="search-select" type="tel" name="accountName"  id ="accountName" value="" placeholder="请输入商户名称" />
+				</div>
+
+				<div class="layui-inline">
+					<label class="f12-gray4">商户号：</label>
+					<input onchange = "changeSelectCon(0,this,'inp')"  class="search-select" type="tel" name="accountId"  id ="accountId" value="" placeholder="请输入商户号" />
+				</div>
+
+				<div class="layui-inline">
+					<label class="f12-gray4">商户类型：</label>
+					<div class=""  style="display:inline-block" id = 'type' name = 'type'></div>
+				</div>
+			</div>
+		</form>
+				
+	</div>
+	
+	<div class="shadow-content" style="margin:1.5rem;">
+			<table id="tableTest" lay-filter="tableFilter"></table>
+	</div>
+	
+	<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>
+     	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+      	<!-- 这里同样支持 laytpl 语法，如： -->
+   	</script>
+	<script type="text/html" id="checkboxDemo">
+     	<input type="checkbox"  {{ d.certtype == '1' ? 'checked' : '' }}>
+	</script>
+    <script>
+	    $("#toggle").click(function() {
+			$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
+			$("#content").slideToggle();
+		});
+     	var table;
+      	layui.use('table', function(){
+		  table = layui.table;
+		  
+		  // 加载数据
+		  table.render({
+			//tbname:'roleTable',
+			id: 'tableTest'
+		    ,elem: '#tableTest'
+		    ,limit:10
+		    ,url: '../../BusinessNumManageAction/businessNumManageQuery' //数据接口
+		    ,method: 'post'
+		    ,where:{MINView:"JSON"}
+		    ,page: true //开启分页
+		    ,cols: [[ //表头
+		      {field:'num', title: '序号',width:'10%', type:'numbers', fixed: true, align: 'center'}
+		      ,{field: 'accountName', title: '商户名称', width:'20%', sort: true, fixed: 'left'}
+		      ,{field: 'accountId', title: '商户号', width:'20%'}
+		      ,{field: 'number', title: '终端号', width:'10%'}
+		      ,{field: 'typeDesc', title: '商户类型', width:'10%'}
+		      ,{field: 'createTime', title: '创建时间', width: '20%'}
+		      ,{field: 'operate', title: '操作', width: '20%', toolbar: '#barDemo', fixed: 'right'}
+		    ]]
+		    ,done: function(res, curr, count){
+		        //如果是异步请求数据方式，res即为你接口返回的信息。
+		        //如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
+		        console.log(res);
+		        
+		        //得到当前页码
+		        console.log(curr); 
+		        
+		        //得到数据总量
+		        console.log(count);
+		      }
+		    ,even: true //开启隔行背景
+		  });
+		  
+		 // 监听工具条（操作）
+		  table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+		    var data = obj.data; //获得当前行数据
+		    var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+		    var tr = obj.tr; //获得当前行 tr 的DOM对象
+
+		    if(layEvent === 'detail'){ //查看
+		    	showDetail(data);
+		      //do somehing
+		    } else if(layEvent === 'del'){ //删除
+		      layer.confirm('确认删除此数据？', function(index){
+		        layer.close(index);
+		        //向服务端发送删除指令roleDelete
+		        $.request({
+					action : "../../BusinessNumManageAction/deleteBusinessNum",
+					data : {
+						id : data.accountId
+					},
+					success : function(resData) {
+						if (resData.MINStatus == 0) {
+							layer.alert('操作成功！', {icon: 1});
+							obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+						} else {
+							layer.alert(resData.MINErrorMessage, {
+		  						icon: 5,
+		  						title: "提示"
+		  					}); 
+						}
+					},
+					error : function(data2){
+						layer.alert(data2.MINErrorMessage, {
+	  						icon: 5,
+	  						title: "提示"
+	  					}); 
+// 						layer.alert(resData.MINErrorMessage, {icon: 2});
+					}
+		      	});
+		      })
+		    } else if(layEvent === 'edit'){ //编辑
+		    	updateDetail(data);
+		    }
+		  });
+		  
+	     var $ = layui.$, active = {
+	   		    getCheckData: function(){ //获取选中数据
+	   		      var checkStatus = table.checkStatus('tableTest')
+	   		      ,data = checkStatus.data;
+	   		      layer.alert(JSON.stringify(data));
+	   		    }
+	   		    ,getCheckLength: function(){ //获取选中数目
+	   		      var checkStatus = table.checkStatus('tableTest')
+	   		      ,data = checkStatus.data;
+	   		      layer.msg('选中了：'+ data.length + ' 个');
+	   		    }
+	   		    ,isAll: function(){ //验证是否全选
+	   		      var checkStatus = table.checkStatus('tableTest');
+	   		      layer.msg(checkStatus.isAll ? '全选': '未全选')
+	   		    }
+	   			//搜索
+	   		    ,reload: function(){
+	   		    	reloadRole();
+	   		    }
+				//重置
+	   		    ,reset : function(){
+	   		    	$('#formName')[0].reset();
+	   		    	$("#conditions").html('<div class="fl f12-gray4-op mt4">所选条件：</div>');
+	   		    }
+	 	};
+// 		$('.demoTable .layui-btn').on('click', function(){
+// 		  var type = $(this).data('type');
+// 		  active[type] ? active[type].call(this) : '';
+// 		});
+		$('.layui-btn').on('click', function(){
+		  	var type = $(this).data('type');
+		  	active[type] ? active[type].call(this) : '';
+		});
+	 });
+      
+	function reloadRole() {
+		//角色名称
+    	var accountName = $("#accountName").val();
+    	var accountId = $("#accountId").val();
+		var type = $('#formName').find("select[name='type']").val();
+
+		//执行重载
+	    table.reload('tableTest', {
+	        page: {
+	        	curr: 1 //重新从第 1 页开始
+	        }
+	        ,where: {
+				accountName : accountName,
+				accountId : accountId,
+				type : type
+	        }
+	     });
+	}
+
+		initSelect('type', "BUSINESSNUM_TYPE", "type", ' ', true);
+
+
+		function updateDetail(data) {
+		  layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
+		  layer.open({
+	    	      type: 2,
+	    	      title: '商户号修改',
+	    	      shadeClose: true,
+	    	      shade:0.8,
+	    	      //maxmin: true, //开启最大化最小化按钮
+	    	      area: ['75%', '85%'],
+	    	      content: '../../admin/businessNumManage/businessNumUpdate.html'
+	    	});
+      }
+		// 新增
+		$("#addBtn").click(function(){
+			// 打开新增页面
+			openMainTabPage('515001-01', ' 新增公众号', 'businessNumManage/businessNumAdd.html', '', '515001', reloadRole);
+		})
+    </script>
+</body>
+</html>

src/main/webapp/admin/businessNumManage/businessNumUpdate.html

@@ -0,0 +1,118 @@
+<!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">
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+<body class="content">
+	<form class="layui-form" id = "formName" >
+    <div style="margin-top: 20px;margin-left: 20px;margin-right: 120px;padding-bottom:60px;" >
+		<div class="layui-form-item">
+			<label class="layui-form-label">商户号</label>
+			<div class="layui-input-block">
+				<input type="text" name="accountId" id="accountId" lay-verify="required" disabled="disabled" class="layui-input">
+			</div>
+		</div>
+
+		<div class="layui-form-item">
+			<label class="layui-form-label">商户类型</label>
+			<div class="layui-input-block">
+				<input type="radio" name="accountType" value="04" lay-filter="accountType" title="富友扫呗">
+				<input type="radio" name="accountType" value="05" lay-filter="accountType" title="合利宝" >
+				<input type="radio" name="accountType" value="06" lay-filter="accountType" title="收钱吧" >
+			</div>
+		</div>
+
+		<div class="layui-form-item">
+			<label class="layui-form-label">商户名称</label>
+			<div class="layui-input-block">
+				<input type="text" name="accountName" id="accountName" lay-verify="required" 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" name="number" id="number" lay-verify="required" autocomplete="off" placeholder="请输入终端号" class="layui-input">
+			</div>
+		</div>
+      </div>  
+      </form>
+       	<div class="layui-form-item box-button">
+           <div class="layui-input-block">
+               <button class="layui-btn" onclick = "updateRole()">提交</button>
+           </div>
+       	</div>
+	<script src="../../js/min-loader-next.js"></script>
+    <!-- 注意：如果你直接复制所有代码到本地，上述js路径需要改成你本地的 -->
+    <script>
+		layui.use('form', function () {
+			var form = layui.form;
+		});
+	    var params = layui.sessionData("ROW_DATA").NOW_ROW;
+		var fields = params.fields;
+		$("#accountId").val(params.accountId);
+		$("#accountName").val(params.accountName);
+		$("#number").val(params.number);
+
+		if (params.type == '04') {
+			$("[name='accountType']:eq(04)").prop("checked","true");
+		} else if (params.type == '05') {
+			$("[name='accountType']:eq(05)").prop("checked","true");
+		} else if (params.type == '06') {
+			$("[name='accountType']:eq(06)").prop("checked","true");
+		}
+
+        // 新增角色按钮
+        function updateRole(){
+			var name = document.getElementById('accountName').value;
+			var number = document.getElementById('number').value;
+
+        	// 校验数据
+			if (isEmpty(number)) {
+				layui.use(['layer'], function(){
+					layer.alert('终端号不能为空！', {icon: 2});
+				})
+				return;
+			}
+			if (isEmpty(name)) {
+				layui.use(['layer'], function(){
+					layer.alert('商户名称不能为空！', {icon: 2});
+				})
+				return;
+			}
+        	// 执行修改
+        	$.request({
+        		action : '../../BusinessNumManageAction/modifybusinessNum',
+        		data : {
+					data :  data.field ,
+        		},
+        		success : function(data){
+        			if (data.MINStatus == 0) {
+        				layui.use(['layer'], function(){
+        					layer.msg('修改成功！', {
+       							icon: 1,
+       							time: 3000 //2秒关闭（如果不配置，默认是3秒）
+       						}, function(){
+       							parent.location.reload();
+       						});
+                		})
+        			} else {
+        				layui.use(['layer'], function(){
+                			layer.alert(data.MINErrorMessage, {icon: 2});
+                		})
+        			}
+        		},
+        		error : function(data) {
+        			layui.use(['layer'], function(){
+            			layer.alert(data.MINErrorMessage, {icon: 2});
+            		})
+        		}
+        	})
+        }
+    </script>
+</body>
+</html>

src/main/webapp/admin/categoryManage/categoryManage.html

@@ -42,7 +42,7 @@
 </div>
 
 <div class="shadow-content" style="margin:1.5rem;">
-	<table id="categoryTable" lay-filter="tableFilter"></table>
+	<table id="tableTest" lay-filter="tableFilter"></table>
 </div>
 
 <script type="text/html" id="barDemo">
@@ -71,8 +71,8 @@
 		// 加载数据
 		table.render({
 			//tbname:'roleTable',
-			id: 'categoryTable'
-			,elem: '#categoryTable'
+			id: 'tableTest'
+			,elem: '#tableTest'
 			,limit:10
 			,url: '../../CategoryManageAction/queryCategoryList' //数据接口
 			,method: 'post'

src/main/webapp/admin/productManage/productManage.html

@@ -28,12 +28,12 @@
 		<div class="order-select back-border"  id="content">
 			<div class="layui-inline">
 				<label class="f12-gray4">商品名称：</label>
-				<input onchange = "changeSelectCon(0,this,'inp')" lay-verify="name"   class="search-select" type="tel" name="name"  id ="name" value="" placeholder="请输入商品名称" />
+				<input  lay-verify="name"   class="search-select" type="tel" name="name"  id ="name" value="" placeholder="请输入商品名称" />
 			</div>
 
 			<div class="layui-inline">
 				<label class="f12-gray4">商品类别：</label>
-				<input onchange = "changeSelectCon(1,this,'inp')" lay-verify="categoryId"   class="search-select" type="tel" name="categoryId"  id ="categoryId" value="" placeholder="请输入商品类别" />
+				<input  lay-verify="categoryId"   class="search-select" type="tel" name="categoryId"  id ="categoryId" value="" placeholder="请输入商品类别" />
 			</div>
 
 			<div class="layui-inline">
@@ -106,11 +106,11 @@
 			    ,range: true
 			    ,format:'yyyyMMdd'
 			});
-			form.render();
-			initSelect('state', "IM_USER_STATE", "state", ' ', true);
-			form.on('select(state)', function(data){
-				changeSelectCon(2, data.elem, "sel","state");
-			});
+			// form.render();
+			// initSelect('state', "PRODUCT_STATE", "state", ' ', true);
+			// form.on('select(state)', function(data){
+			// 	changeSelectCon(2, data.elem, "sel","state");
+			// });
 		})
    	        layui.use('form', function(){
         	var form = layui.form;
@@ -339,28 +339,9 @@
 
 		//新增商品
 		$(document).on('click','#addBtn',function(){
-			openMainTabPage('501001-01', ' 新增商品', 'productManage/productAdd.html', '', '501001', reLoadFun);
+			openMainTabPage('501001-01', ' 新增商品', 'productManage/productAdd.html', '', '501001', reloadRole);
 		});
 
-	  	// 重新加载
-	  	function queryReload() {
-			var name = $('#name').val();
-	    	var dates = $('#dates').val();
-	    	var state = $('#formName').find("select[name='state']").val();
-	    	var categoryId = $('#categoryId').val();
-	        //执行重载
-		    table.reload('tableTest', {
-		        page : {
-		          curr : 1 //重新从第 1 页开始
-		        }
-		        ,where : {
-		        	name : name,
-		        	state : state,
-		        	categoryId : categoryId,
-		        	dates : dates
-		        }
-			});
-	 	}
 	  	function choose(dat){
 	  		$("#categoryId").val(dat.split(',')[1]);
 	  		$("#category").val(dat.split(',')[0]);
@@ -386,30 +367,55 @@
 
 		var $ = layui.$, active = {
 			reload: function(){
-				reLoadFun();
+				reloadRole();
 			}
 			,reset: function(){
 				$('#formName')[0].reset()
 			}
 		};
 
-		function reLoadFun() {
+		var $ = layui.$, active = {
+			getCheckData: function(){ //获取选中数据
+				var checkStatus = table.checkStatus('tableTest')
+						,data = checkStatus.data;
+				layer.alert(JSON.stringify(data));
+			}
+			,getCheckLength: function(){ //获取选中数目
+				var checkStatus = table.checkStatus('tableTest')
+						,data = checkStatus.data;
+				layer.msg('选中了：'+ data.length + ' 个');
+			}
+			,isAll: function(){ //验证是否全选
+				var checkStatus = table.checkStatus('tableTest');
+				layer.msg(checkStatus.isAll ? '全选': '未全选')
+			}
+			//搜索
+			,reload: function(){
+				reloadRole();
+			}
+			//重置
+			,reset : function(){
+				$('#formName')[0].reset();
+				$("#conditions").html('<div class="fl f12-gray4-op mt4">所选条件：</div>');
+			}
+		};
+
+		// 重新加载
+		function reloadRole() {
 			var name = $('#name').val();
-			var logonname = $('#logonname').val();
-			var state = $("select[name='state']").val();
-			var roleid = $("select[name='roleid']").val();
-			var dates = $("#dates").val();
+			var dates = $('#dates').val();
+			var state = $('#formName').find("select[name='state']").val();
+			var categoryId = $('#categoryId').val();
 			//执行重载
-			table.reload('userManage', {
-				page: {
-					curr: 1 //重新从第 1 页开始
+			table.reload('tableTest', {
+				page : {
+					curr : 1 //重新从第 1 页开始
 				}
-				,where: {
+				,where : {
 					name : name,
-					logonname : logonname,
-					roleid : roleid,
-					stt : state,
-					dates :dates
+					state : state,
+					categoryId : categoryId,
+					dates : dates
 				}
 			});
 		}

src/main/webapp/admin/tencentManage/tencentAssociated.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>角色详情</title>
+    <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">