20190514

src/main/java/com/izouma/awesomeadmin/dao/MarketCodeLogMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.MarketCodeLog;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.MarketCodeLogMapper")
+public interface MarketCodeLogMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(MarketCodeLog record);
+
+    MarketCodeLog selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(MarketCodeLog record);
+
+    List<MarketCodeLog> queryAllMarketCodeLog(MarketCodeLog record);
+
+    List<MarketCodeLog> queryMarketCodeLogByPage(Map<String, Object> parameter);
+
+    int delete(MarketCodeLog record);
+
+    MarketCodeLog queryMarketCodeLog(MarketCodeLog record);
+
+    List<MarketCodeLog> query(MarketCodeLog record);
+}
+

src/main/java/com/izouma/awesomeadmin/dao/MarketCodeLogMapper.xml

@@ -0,0 +1,436 @@
+<?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.izouma.awesomeadmin.dao.MarketCodeLogMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.MarketCodeLog" >
+                <id column="id" property="id" jdbcType="INTEGER" />
+                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
+                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+                                <result column="user_id" property="userId" jdbcType="INTEGER" />
+                                <result column="market_code" property="marketCode" jdbcType="VARCHAR" />
+                                <result column="market_user_id" property="marketUserId" jdbcType="INTEGER" />
+                                <result column="total_price" property="totalPrice" jdbcType="DECIMAL" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            user_id,
+
+            market_code,
+
+            market_user_id,
+
+            total_price,
+
+            remark,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from market_code_log
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from market_code_log
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.MarketCodeLog" useGeneratedKeys="true" keyProperty="id">
+        insert into market_code_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id!= null" >
+                id,
+            </if>
+                <if test="delFlag!= null" >
+                del_flag,
+            </if>
+                <if test="updateTime!= null" >
+                update_time,
+            </if>
+                <if test="updateUser!= null" >
+                update_user,
+            </if>
+                <if test="createTime!= null" >
+                create_time,
+            </if>
+                <if test="createUser!= null" >
+                create_user,
+            </if>
+                <if test="userId!= null" >
+                user_id,
+            </if>
+                <if test="marketCode!= null" >
+                market_code,
+            </if>
+                <if test="marketUserId!= null" >
+                market_user_id,
+            </if>
+                <if test="totalPrice!= null" >
+                total_price,
+            </if>
+                <if test="remark!= null" >
+                remark,
+            </if>
+            </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+                    <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+                    <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </if>
+                    <if test="updateTime != null" >
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="updateUser != null" >
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="createUser != null" >
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="userId != null" >
+                #{userId,jdbcType=INTEGER},
+            </if>
+                    <if test="marketCode != null" >
+                #{marketCode,jdbcType=VARCHAR},
+            </if>
+                    <if test="marketUserId != null" >
+                #{marketUserId,jdbcType=INTEGER},
+            </if>
+                    <if test="totalPrice != null" >
+                #{totalPrice,jdbcType=DECIMAL},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.MarketCodeLog" >
+        update market_code_log
+        <set >
+                    <if test="id != null" >
+               id= #{id,jdbcType=INTEGER},
+            </if>
+                     <if test="delFlag != null" >
+               del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+                     <if test="updateTime != null" >
+               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="updateUser != null" >
+               update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="createTime != null" >
+               create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="createUser != null" >
+               create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="userId != null" >
+               user_id= #{userId,jdbcType=INTEGER},
+            </if>
+                     <if test="marketCode != null" >
+               market_code= #{marketCode,jdbcType=VARCHAR},
+            </if>
+                     <if test="marketUserId != null" >
+               market_user_id= #{marketUserId,jdbcType=INTEGER},
+            </if>
+                     <if test="totalPrice != null" >
+               total_price= #{totalPrice,jdbcType=DECIMAL},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
+            </if>
+                 </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <select id="queryMarketCodeLogByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MarketCodeLog">
+        select <include refid="Base_Column_List"/> from market_code_log
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and  id = #{record.id}
+            </if>
+                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and  del_flag = #{record.delFlag}
+            </if>
+                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and  update_time = #{record.updateTime}
+            </if>
+                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and  update_user = #{record.updateUser}
+            </if>
+                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and  create_time = #{record.createTime}
+            </if>
+                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and  create_user = #{record.createUser}
+            </if>
+                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
+                and  user_id = #{record.userId}
+            </if>
+                     <if test="record.marketCode != null and !&quot;&quot;.equals(record.marketCode)">
+                and  market_code = #{record.marketCode}
+            </if>
+                     <if test="record.marketUserId != null and !&quot;&quot;.equals(record.marketUserId)">
+                and  market_user_id = #{record.marketUserId}
+            </if>
+                     <if test="record.totalPrice != null and !&quot;&quot;.equals(record.totalPrice)">
+                and  total_price = #{record.totalPrice}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  market_code LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  market_user_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  total_price LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllMarketCodeLog" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MarketCodeLog">
+        select <include refid="Base_Column_List"/> from market_code_log
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and  id = #{id}
+            </if>
+                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and  del_flag = #{delFlag}
+            </if>
+                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and  update_time = #{updateTime}
+            </if>
+                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and  update_user = #{updateUser}
+            </if>
+                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and  create_time = #{createTime}
+            </if>
+                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and  create_user = #{createUser}
+            </if>
+                    <if test="userId != null and !&quot;&quot;.equals(userId)">
+                and  user_id = #{userId}
+            </if>
+                    <if test="marketCode != null and !&quot;&quot;.equals(marketCode)">
+                and  market_code = #{marketCode}
+            </if>
+                    <if test="marketUserId != null and !&quot;&quot;.equals(marketUserId)">
+                and  market_user_id = #{marketUserId}
+            </if>
+                    <if test="totalPrice != null and !&quot;&quot;.equals(totalPrice)">
+                and  total_price = #{totalPrice}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  user_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  market_code LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  market_user_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  total_price LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryMarketCodeLog" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MarketCodeLog">
+        select <include refid="Base_Column_List"/> from market_code_log
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+                     <if test="userId != null and !&quot;&quot;.equals(userId)">
+                and user_id = #{userId}
+            </if>
+                     <if test="marketCode != null and !&quot;&quot;.equals(marketCode)">
+                and market_code = #{marketCode}
+            </if>
+                     <if test="marketUserId != null and !&quot;&quot;.equals(marketUserId)">
+                and market_user_id = #{marketUserId}
+            </if>
+                     <if test="totalPrice != null and !&quot;&quot;.equals(totalPrice)">
+                and total_price = #{totalPrice}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE market_code_log SET del_flag = 'Y'
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MarketCodeLog">
+        select <include refid="Base_Column_List"/> from market_code_log
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
+</mapper>
+

src/main/java/com/izouma/awesomeadmin/dao/NavigationPackageMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.NavigationPackage;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.NavigationPackageMapper")
+public interface NavigationPackageMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(NavigationPackage record);
+
+    NavigationPackage selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(NavigationPackage record);
+
+    List<NavigationPackage> queryAllNavigationPackage(NavigationPackage record);
+
+    List<NavigationPackage> queryNavigationPackageByPage(Map<String, Object> parameter);
+
+    int delete(NavigationPackage record);
+
+    NavigationPackage queryNavigationPackage(NavigationPackage record);
+
+    List<NavigationPackage> query(NavigationPackage record);
+}
+

src/main/java/com/izouma/awesomeadmin/dao/NavigationPackageMapper.xml

@@ -0,0 +1,503 @@
+<?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.izouma.awesomeadmin.dao.NavigationPackageMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.NavigationPackage" >
+                <id column="id" property="id" jdbcType="INTEGER" />
+                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
+                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+                                <result column="land_mark_id" property="landMarkId" jdbcType="INTEGER" />
+                                <result column="name" property="name" jdbcType="VARCHAR" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
+                                <result column="pay_flag" property="payFlag" jdbcType="CHAR" />
+                                <result column="price" property="price" jdbcType="DECIMAL" />
+                                <result column="aim_place" property="aimPlace" jdbcType="VARCHAR" />
+                                <result column="rank" property="rank" jdbcType="INTEGER" />
+                                <result column="shelf_flag" property="shelfFlag" jdbcType="CHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            land_mark_id,
+
+            name,
+
+            remark,
+
+            pay_flag,
+
+            price,
+
+            aim_place,
+
+            rank,
+
+            shelf_flag,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from navigation_package
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from navigation_package
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.NavigationPackage" useGeneratedKeys="true" keyProperty="id">
+        insert into navigation_package
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id!= null" >
+                id,
+            </if>
+                <if test="delFlag!= null" >
+                del_flag,
+            </if>
+                <if test="updateTime!= null" >
+                update_time,
+            </if>
+                <if test="updateUser!= null" >
+                update_user,
+            </if>
+                <if test="createTime!= null" >
+                create_time,
+            </if>
+                <if test="createUser!= null" >
+                create_user,
+            </if>
+                <if test="landMarkId!= null" >
+                land_mark_id,
+            </if>
+                <if test="name!= null" >
+                name,
+            </if>
+                <if test="remark!= null" >
+                remark,
+            </if>
+                <if test="payFlag!= null" >
+                pay_flag,
+            </if>
+                <if test="price!= null" >
+                price,
+            </if>
+                <if test="aimPlace!= null" >
+                aim_place,
+            </if>
+                <if test="rank!= null" >
+                rank,
+            </if>
+                <if test="shelfFlag!= null" >
+                shelf_flag,
+            </if>
+            </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+                    <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+                    <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </if>
+                    <if test="updateTime != null" >
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="updateUser != null" >
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="createUser != null" >
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="landMarkId != null" >
+                #{landMarkId,jdbcType=INTEGER},
+            </if>
+                    <if test="name != null" >
+                #{name,jdbcType=VARCHAR},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
+            </if>
+                    <if test="payFlag != null" >
+                #{payFlag,jdbcType=CHAR},
+            </if>
+                    <if test="price != null" >
+                #{price,jdbcType=DECIMAL},
+            </if>
+                    <if test="aimPlace != null" >
+                #{aimPlace,jdbcType=VARCHAR},
+            </if>
+                    <if test="rank != null" >
+                #{rank,jdbcType=INTEGER},
+            </if>
+                    <if test="shelfFlag != null" >
+                #{shelfFlag,jdbcType=CHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.NavigationPackage" >
+        update navigation_package
+        <set >
+                    <if test="id != null" >
+               id= #{id,jdbcType=INTEGER},
+            </if>
+                     <if test="delFlag != null" >
+               del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+                     <if test="updateTime != null" >
+               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="updateUser != null" >
+               update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="createTime != null" >
+               create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="createUser != null" >
+               create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="landMarkId != null" >
+               land_mark_id= #{landMarkId,jdbcType=INTEGER},
+            </if>
+                     <if test="name != null" >
+               name= #{name,jdbcType=VARCHAR},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
+            </if>
+                     <if test="payFlag != null" >
+               pay_flag= #{payFlag,jdbcType=CHAR},
+            </if>
+                     <if test="price != null" >
+               price= #{price,jdbcType=DECIMAL},
+            </if>
+                     <if test="aimPlace != null" >
+               aim_place= #{aimPlace,jdbcType=VARCHAR},
+            </if>
+                     <if test="rank != null" >
+               rank= #{rank,jdbcType=INTEGER},
+            </if>
+                     <if test="shelfFlag != null" >
+               shelf_flag= #{shelfFlag,jdbcType=CHAR},
+            </if>
+                 </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <select id="queryNavigationPackageByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.NavigationPackage">
+        select <include refid="Base_Column_List"/> from navigation_package
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and  id = #{record.id}
+            </if>
+                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and  del_flag = #{record.delFlag}
+            </if>
+                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and  update_time = #{record.updateTime}
+            </if>
+                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and  update_user = #{record.updateUser}
+            </if>
+                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and  create_time = #{record.createTime}
+            </if>
+                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and  create_user = #{record.createUser}
+            </if>
+                     <if test="record.landMarkId != null and !&quot;&quot;.equals(record.landMarkId)">
+                and  land_mark_id = #{record.landMarkId}
+            </if>
+                     <if test="record.name != null and !&quot;&quot;.equals(record.name)">
+                and  name = #{record.name}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
+            </if>
+                     <if test="record.payFlag != null and !&quot;&quot;.equals(record.payFlag)">
+                and  pay_flag = #{record.payFlag}
+            </if>
+                     <if test="record.price != null and !&quot;&quot;.equals(record.price)">
+                and  price = #{record.price}
+            </if>
+                     <if test="record.aimPlace != null and !&quot;&quot;.equals(record.aimPlace)">
+                and  aim_place = #{record.aimPlace}
+            </if>
+                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and  rank = #{record.rank}
+            </if>
+                     <if test="record.shelfFlag != null and !&quot;&quot;.equals(record.shelfFlag)">
+                and  shelf_flag = #{record.shelfFlag}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  land_mark_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  pay_flag LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  price LIKE concat('%',#{record.searchKey},'%')
+                                                                                                                                                                     OR  rank LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  shelf_flag LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllNavigationPackage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.NavigationPackage">
+        select <include refid="Base_Column_List"/> from navigation_package
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and  id = #{id}
+            </if>
+                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and  del_flag = #{delFlag}
+            </if>
+                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and  update_time = #{updateTime}
+            </if>
+                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and  update_user = #{updateUser}
+            </if>
+                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and  create_time = #{createTime}
+            </if>
+                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and  create_user = #{createUser}
+            </if>
+                    <if test="landMarkId != null and !&quot;&quot;.equals(landMarkId)">
+                and  land_mark_id = #{landMarkId}
+            </if>
+                    <if test="name != null and !&quot;&quot;.equals(name)">
+                and  name = #{name}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
+            </if>
+                    <if test="payFlag != null and !&quot;&quot;.equals(payFlag)">
+                and  pay_flag = #{payFlag}
+            </if>
+                    <if test="price != null and !&quot;&quot;.equals(price)">
+                and  price = #{price}
+            </if>
+                    <if test="aimPlace != null and !&quot;&quot;.equals(aimPlace)">
+                and  aim_place = #{aimPlace}
+            </if>
+                    <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and  rank = #{rank}
+            </if>
+                    <if test="shelfFlag != null and !&quot;&quot;.equals(shelfFlag)">
+                and  shelf_flag = #{shelfFlag}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  land_mark_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  pay_flag LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  price LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  shelf_flag LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryNavigationPackage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.NavigationPackage">
+        select <include refid="Base_Column_List"/> from navigation_package
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+                     <if test="landMarkId != null and !&quot;&quot;.equals(landMarkId)">
+                and land_mark_id = #{landMarkId}
+            </if>
+                     <if test="name != null and !&quot;&quot;.equals(name)">
+                and name = #{name}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+                     <if test="payFlag != null and !&quot;&quot;.equals(payFlag)">
+                and pay_flag = #{payFlag}
+            </if>
+                     <if test="price != null and !&quot;&quot;.equals(price)">
+                and price = #{price}
+            </if>
+                     <if test="aimPlace != null and !&quot;&quot;.equals(aimPlace)">
+                and aim_place = #{aimPlace}
+            </if>
+                     <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+                     <if test="shelfFlag != null and !&quot;&quot;.equals(shelfFlag)">
+                and shelf_flag = #{shelfFlag}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE navigation_package SET del_flag = 'Y'
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.NavigationPackage">
+        select <include refid="Base_Column_List"/> from navigation_package
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </where>
+        order by id desc
+    </select>
+</mapper>
+

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.UserOrder;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.UserOrderMapper")
+public interface UserOrderMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(UserOrder record);
+
+    UserOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(UserOrder record);
+
+    List<UserOrder> queryAllUserOrder(UserOrder record);
+
+    List<UserOrder> queryUserOrderByPage(Map<String, Object> parameter);
+
+    int delete(UserOrder record);
+
+    UserOrder queryUserOrder(UserOrder record);
+
+    List<UserOrder> query(UserOrder record);
+}
+

src/main/java/com/izouma/awesomeadmin/model/MarketCodeLog.java

@@ -0,0 +1,149 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MarketCodeLog{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer userId;
+    private String marketCode;
+    private Integer marketUserId;
+    private BigDecimal totalPrice;
+    private String remark;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(Integer userId){
+        this.userId = userId;
+    }
+    public String getMarketCode(){
+        return this.marketCode;
+    }
+
+    public void setMarketCode(String marketCode){
+        this.marketCode = marketCode;
+    }
+    public Integer getMarketUserId(){
+        return this.marketUserId;
+    }
+
+    public void setMarketUserId(Integer marketUserId){
+        this.marketUserId = marketUserId;
+    }
+    public BigDecimal getTotalPrice(){
+        return this.totalPrice;
+    }
+
+    public void setTotalPrice(BigDecimal totalPrice){
+        this.totalPrice = totalPrice;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

src/main/java/com/izouma/awesomeadmin/model/NavigationPackage.java

@@ -0,0 +1,173 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NavigationPackage{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer landMarkId;
+    private String name;
+    private String remark;
+    private String payFlag;
+    private BigDecimal price;
+    private String aimPlace;
+    private Integer rank;
+    private String shelfFlag;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getLandMarkId(){
+        return this.landMarkId;
+    }
+
+    public void setLandMarkId(Integer landMarkId){
+        this.landMarkId = landMarkId;
+    }
+    public String getName(){
+        return this.name;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getPayFlag(){
+        return this.payFlag;
+    }
+
+    public void setPayFlag(String payFlag){
+        this.payFlag = payFlag;
+    }
+    public BigDecimal getPrice(){
+        return this.price;
+    }
+
+    public void setPrice(BigDecimal price){
+        this.price = price;
+    }
+    public String getAimPlace(){
+        return this.aimPlace;
+    }
+
+    public void setAimPlace(String aimPlace){
+        this.aimPlace = aimPlace;
+    }
+    public Integer getRank(){
+        return this.rank;
+    }
+
+    public void setRank(Integer rank){
+        this.rank = rank;
+    }
+    public String getShelfFlag(){
+        return this.shelfFlag;
+    }
+
+    public void setShelfFlag(String shelfFlag){
+        this.shelfFlag = shelfFlag;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

src/main/java/com/izouma/awesomeadmin/model/UserOrder.java

@@ -0,0 +1,213 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UserOrder{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer userId;
+    private Integer lankMarkId;
+    private Integer packageId;
+    private Integer statusFlag;
+    private Date payTime;
+    private Integer payMode;
+    private String remark;
+    private String showFlag;
+    private BigDecimal totlePrice;
+    private BigDecimal cash;
+    private BigDecimal point;
+    private BigDecimal dealPrice;
+    private String marketCode;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(Integer userId){
+        this.userId = userId;
+    }
+    public Integer getLankMarkId(){
+        return this.lankMarkId;
+    }
+
+    public void setLankMarkId(Integer lankMarkId){
+        this.lankMarkId = lankMarkId;
+    }
+    public Integer getPackageId(){
+        return this.packageId;
+    }
+
+    public void setPackageId(Integer packageId){
+        this.packageId = packageId;
+    }
+    public Integer getStatusFlag(){
+        return this.statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag){
+        this.statusFlag = statusFlag;
+    }
+    public Date getPayTime(){
+        return this.payTime;
+    }
+
+    public void setPayTime(Date payTime){
+        this.payTime = payTime;
+    }
+    public Integer getPayMode(){
+        return this.payMode;
+    }
+
+    public void setPayMode(Integer payMode){
+        this.payMode = payMode;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getShowFlag(){
+        return this.showFlag;
+    }
+
+    public void setShowFlag(String showFlag){
+        this.showFlag = showFlag;
+    }
+    public BigDecimal getTotlePrice(){
+        return this.totlePrice;
+    }
+
+    public void setTotlePrice(BigDecimal totlePrice){
+        this.totlePrice = totlePrice;
+    }
+    public BigDecimal getCash(){
+        return this.cash;
+    }
+
+    public void setCash(BigDecimal cash){
+        this.cash = cash;
+    }
+    public BigDecimal getPoint(){
+        return this.point;
+    }
+
+    public void setPoint(BigDecimal point){
+        this.point = point;
+    }
+    public BigDecimal getDealPrice(){
+        return this.dealPrice;
+    }
+
+    public void setDealPrice(BigDecimal dealPrice){
+        this.dealPrice = dealPrice;
+    }
+    public String getMarketCode(){
+        return this.marketCode;
+    }
+
+    public void setMarketCode(String marketCode){
+        this.marketCode = marketCode;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

src/main/java/com/izouma/awesomeadmin/service/MarketCodeLogService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.MarketCodeLog;
+
+
+/**
+*  service接口类
+*/
+public interface MarketCodeLogService{
+
+    List<MarketCodeLog> getMarketCodeLogList(MarketCodeLog record);
+
+    List<MarketCodeLog> getMarketCodeLogByPage(Page page, MarketCodeLog record);
+
+    MarketCodeLog getMarketCodeLogById(String id);
+
+    MarketCodeLog getMarketCodeLog(MarketCodeLog record);
+
+    boolean createMarketCodeLog(MarketCodeLog record);
+
+    boolean deleteMarketCodeLog(MarketCodeLog record);
+
+    boolean updateMarketCodeLog(MarketCodeLog record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/NavigationPackageService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.NavigationPackage;
+
+
+/**
+*  service接口类
+*/
+public interface NavigationPackageService{
+
+    List<NavigationPackage> getNavigationPackageList(NavigationPackage record);
+
+    List<NavigationPackage> getNavigationPackageByPage(Page page, NavigationPackage record);
+
+    NavigationPackage getNavigationPackageById(String id);
+
+    NavigationPackage getNavigationPackage(NavigationPackage record);
+
+    boolean createNavigationPackage(NavigationPackage record);
+
+    boolean deleteNavigationPackage(NavigationPackage record);
+
+    boolean updateNavigationPackage(NavigationPackage record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/UserOrderService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.UserOrder;
+
+
+/**
+*  service接口类
+*/
+public interface UserOrderService{
+
+    List<UserOrder> getUserOrderList(UserOrder record);
+
+    List<UserOrder> getUserOrderByPage(Page page, UserOrder record);
+
+    UserOrder getUserOrderById(String id);
+
+    UserOrder getUserOrder(UserOrder record);
+
+    boolean createUserOrder(UserOrder record);
+
+    boolean deleteUserOrder(UserOrder record);
+
+    boolean updateUserOrder(UserOrder record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/MarketCodeLogServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.MarketCodeLog;
+import com.izouma.awesomeadmin.service.MarketCodeLogService;
+import com.izouma.awesomeadmin.dao.MarketCodeLogMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class MarketCodeLogServiceImpl implements MarketCodeLogService{
+
+    private static Logger logger = Logger.getLogger(MarketCodeLogServiceImpl.class);
+
+    @Autowired
+    private MarketCodeLogMapper marketCodeLogMapper;
+
+    @Override
+    public List<MarketCodeLog> getMarketCodeLogList(MarketCodeLog record) {
+
+        logger.info("getMarketCodeLogList");
+        try {
+
+        return marketCodeLogMapper.queryAllMarketCodeLog(record);
+        } catch (Exception e) {
+        logger.error("getMarketCodeLogList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<MarketCodeLog> getMarketCodeLogByPage(Page page, MarketCodeLog record) {
+
+        logger.info("getMarketCodeLogByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return marketCodeLogMapper.queryMarketCodeLogByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getMarketCodeLogByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public MarketCodeLog getMarketCodeLogById(String id) {
+
+        logger.info("getMarketCodeLogyId");
+        try {
+
+            return marketCodeLogMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getMarketCodeLogById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public MarketCodeLog getMarketCodeLog(MarketCodeLog record) {
+
+        logger.info("getMarketCodeLog");
+        try {
+
+            return marketCodeLogMapper.queryMarketCodeLog(record);
+        } catch (Exception e) {
+        logger.error("getMarketCodeLog", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createMarketCodeLog(MarketCodeLog record) {
+
+        logger.info("createMarketCodeLog");
+        try {
+
+            int updates = marketCodeLogMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createMarketCodeLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteMarketCodeLog(MarketCodeLog record) {
+
+        logger.info("deleteMarketCodeLog");
+        try {
+
+             int updates = marketCodeLogMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteMarketCodeLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateMarketCodeLog(MarketCodeLog record) {
+
+        logger.info("updateMarketCodeLog");
+        try {
+
+            int updates = marketCodeLogMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateMarketCodeLog", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/NavigationPackageServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.NavigationPackage;
+import com.izouma.awesomeadmin.service.NavigationPackageService;
+import com.izouma.awesomeadmin.dao.NavigationPackageMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class NavigationPackageServiceImpl implements NavigationPackageService{
+
+    private static Logger logger = Logger.getLogger(NavigationPackageServiceImpl.class);
+
+    @Autowired
+    private NavigationPackageMapper navigationPackageMapper;
+
+    @Override
+    public List<NavigationPackage> getNavigationPackageList(NavigationPackage record) {
+
+        logger.info("getNavigationPackageList");
+        try {
+
+        return navigationPackageMapper.queryAllNavigationPackage(record);
+        } catch (Exception e) {
+        logger.error("getNavigationPackageList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<NavigationPackage> getNavigationPackageByPage(Page page, NavigationPackage record) {
+
+        logger.info("getNavigationPackageByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return navigationPackageMapper.queryNavigationPackageByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getNavigationPackageByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public NavigationPackage getNavigationPackageById(String id) {
+
+        logger.info("getNavigationPackageyId");
+        try {
+
+            return navigationPackageMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getNavigationPackageById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public NavigationPackage getNavigationPackage(NavigationPackage record) {
+
+        logger.info("getNavigationPackage");
+        try {
+
+            return navigationPackageMapper.queryNavigationPackage(record);
+        } catch (Exception e) {
+        logger.error("getNavigationPackage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createNavigationPackage(NavigationPackage record) {
+
+        logger.info("createNavigationPackage");
+        try {
+
+            int updates = navigationPackageMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createNavigationPackage", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteNavigationPackage(NavigationPackage record) {
+
+        logger.info("deleteNavigationPackage");
+        try {
+
+             int updates = navigationPackageMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteNavigationPackage", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateNavigationPackage(NavigationPackage record) {
+
+        logger.info("updateNavigationPackage");
+        try {
+
+            int updates = navigationPackageMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateNavigationPackage", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.UserOrder;
+import com.izouma.awesomeadmin.service.UserOrderService;
+import com.izouma.awesomeadmin.dao.UserOrderMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class UserOrderServiceImpl implements UserOrderService{
+
+    private static Logger logger = Logger.getLogger(UserOrderServiceImpl.class);
+
+    @Autowired
+    private UserOrderMapper userOrderMapper;
+
+    @Override
+    public List<UserOrder> getUserOrderList(UserOrder record) {
+
+        logger.info("getUserOrderList");
+        try {
+
+        return userOrderMapper.queryAllUserOrder(record);
+        } catch (Exception e) {
+        logger.error("getUserOrderList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<UserOrder> getUserOrderByPage(Page page, UserOrder record) {
+
+        logger.info("getUserOrderByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return userOrderMapper.queryUserOrderByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getUserOrderByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserOrder getUserOrderById(String id) {
+
+        logger.info("getUserOrderyId");
+        try {
+
+            return userOrderMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getUserOrderById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserOrder getUserOrder(UserOrder record) {
+
+        logger.info("getUserOrder");
+        try {
+
+            return userOrderMapper.queryUserOrder(record);
+        } catch (Exception e) {
+        logger.error("getUserOrder", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createUserOrder(UserOrder record) {
+
+        logger.info("createUserOrder");
+        try {
+
+            int updates = userOrderMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createUserOrder", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteUserOrder(UserOrder record) {
+
+        logger.info("deleteUserOrder");
+        try {
+
+             int updates = userOrderMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteUserOrder", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateUserOrder(UserOrder record) {
+
+        logger.info("updateUserOrder");
+        try {
+
+            int updates = userOrderMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateUserOrder", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/web/MarketCodeLogController.java

@@ -0,0 +1,162 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.MarketCodeLog;
+import com.izouma.awesomeadmin.service.MarketCodeLogService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/marketCodeLog")
+public class MarketCodeLogController {
+
+    @Autowired
+    private MarketCodeLogService marketCodeLogService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(MarketCodeLog record) {
+        List<MarketCodeLog> pp = marketCodeLogService.getMarketCodeLogList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getMarketCodeLog", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getMarketCodeLog(@RequestParam(required = false, value = "id") String id) {
+        MarketCodeLog data = marketCodeLogService.getMarketCodeLogById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(MarketCodeLog record) {
+        MarketCodeLog data = marketCodeLogService.getMarketCodeLog(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, MarketCodeLog record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<MarketCodeLog> pp =marketCodeLogService.getMarketCodeLogByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(MarketCodeLog record) {
+        boolean num = marketCodeLogService.createMarketCodeLog(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateMarketCodeLog(MarketCodeLog record) {
+        boolean num = marketCodeLogService.updateMarketCodeLog(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteMarketCodeLog(MarketCodeLog record) {
+
+        boolean num = marketCodeLogService.deleteMarketCodeLog(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, MarketCodeLog record) throws Exception {
+
+    List<MarketCodeLog> marketCodeLogs = marketCodeLogService.getMarketCodeLogList(record);
+
+
+        String sheetName = "market_code_log";
+        String titleName = "推广码记录数据表";
+        String fileName = "推广码记录表";
+        int columnNumber = 11;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "推广码" ,   "推广用户" ,   "价格" ,   "备注"  };
+        String[][] dataList = new String[marketCodeLogs.size()][11];
+
+        for (int i = 0; i < marketCodeLogs.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(marketCodeLogs.get(i).getId());
+                        dataList[i][1] = String.valueOf(marketCodeLogs.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(marketCodeLogs.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(marketCodeLogs.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(marketCodeLogs.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(marketCodeLogs.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(marketCodeLogs.get(i).getUserId());
+                        dataList[i][7] = String.valueOf(marketCodeLogs.get(i).getMarketCode());
+                        dataList[i][8] = String.valueOf(marketCodeLogs.get(i).getMarketUserId());
+                        dataList[i][9] = String.valueOf(marketCodeLogs.get(i).getTotalPrice());
+                        dataList[i][10] = String.valueOf(marketCodeLogs.get(i).getRemark());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/java/com/izouma/awesomeadmin/web/NavigationPackageController.java

@@ -0,0 +1,165 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.NavigationPackage;
+import com.izouma.awesomeadmin.service.NavigationPackageService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/navigationPackage")
+public class NavigationPackageController {
+
+    @Autowired
+    private NavigationPackageService navigationPackageService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(NavigationPackage record) {
+        List<NavigationPackage> pp = navigationPackageService.getNavigationPackageList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getNavigationPackage", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getNavigationPackage(@RequestParam(required = false, value = "id") String id) {
+        NavigationPackage data = navigationPackageService.getNavigationPackageById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(NavigationPackage record) {
+        NavigationPackage data = navigationPackageService.getNavigationPackage(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, NavigationPackage record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<NavigationPackage> pp =navigationPackageService.getNavigationPackageByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(NavigationPackage record) {
+        boolean num = navigationPackageService.createNavigationPackage(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateNavigationPackage(NavigationPackage record) {
+        boolean num = navigationPackageService.updateNavigationPackage(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteNavigationPackage(NavigationPackage record) {
+
+        boolean num = navigationPackageService.deleteNavigationPackage(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, NavigationPackage record) throws Exception {
+
+    List<NavigationPackage> navigationPackages = navigationPackageService.getNavigationPackageList(record);
+
+
+        String sheetName = "navigation_package";
+        String titleName = "导航包数据表";
+        String fileName = "导航包表";
+        int columnNumber = 14;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "地标ID" ,   "标题" ,   "描述" ,   "是否付费" ,   "价格" ,   "点标" ,   "排序" ,   "是否上线"  };
+        String[][] dataList = new String[navigationPackages.size()][14];
+
+        for (int i = 0; i < navigationPackages.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(navigationPackages.get(i).getId());
+                        dataList[i][1] = String.valueOf(navigationPackages.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(navigationPackages.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(navigationPackages.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(navigationPackages.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(navigationPackages.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(navigationPackages.get(i).getLandMarkId());
+                        dataList[i][7] = String.valueOf(navigationPackages.get(i).getName());
+                        dataList[i][8] = String.valueOf(navigationPackages.get(i).getRemark());
+                        dataList[i][9] = String.valueOf(navigationPackages.get(i).getPayFlag());
+                        dataList[i][10] = String.valueOf(navigationPackages.get(i).getPrice());
+                        dataList[i][11] = String.valueOf(navigationPackages.get(i).getAimPlace());
+                        dataList[i][12] = String.valueOf(navigationPackages.get(i).getRank());
+                        dataList[i][13] = String.valueOf(navigationPackages.get(i).getShelfFlag());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/java/com/izouma/awesomeadmin/web/UserOrderController.java

@@ -0,0 +1,170 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.UserOrder;
+import com.izouma.awesomeadmin.service.UserOrderService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/userOrder")
+public class UserOrderController {
+
+    @Autowired
+    private UserOrderService userOrderService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(UserOrder record) {
+        List<UserOrder> pp = userOrderService.getUserOrderList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getUserOrder", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getUserOrder(@RequestParam(required = false, value = "id") String id) {
+        UserOrder data = userOrderService.getUserOrderById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(UserOrder record) {
+        UserOrder data = userOrderService.getUserOrder(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, UserOrder record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<UserOrder> pp =userOrderService.getUserOrderByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(UserOrder record) {
+        boolean num = userOrderService.createUserOrder(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateUserOrder(UserOrder record) {
+        boolean num = userOrderService.updateUserOrder(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteUserOrder(UserOrder record) {
+
+        boolean num = userOrderService.deleteUserOrder(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, UserOrder record) throws Exception {
+
+    List<UserOrder> userOrders = userOrderService.getUserOrderList(record);
+
+
+        String sheetName = "user_order";
+        String titleName = "用户订单数据表";
+        String fileName = "用户订单表";
+        int columnNumber = 19;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "地标ID" ,   "导游包ID" ,   "状态" ,   "支付时间" ,   "支付方式" ,   "备注" ,   "显示标识" ,   "金额" ,   "现金" ,   "积分" ,   "成交" ,   "推广码"  };
+        String[][] dataList = new String[userOrders.size()][19];
+
+        for (int i = 0; i < userOrders.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(userOrders.get(i).getId());
+                        dataList[i][1] = String.valueOf(userOrders.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(userOrders.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(userOrders.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(userOrders.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(userOrders.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(userOrders.get(i).getUserId());
+                        dataList[i][7] = String.valueOf(userOrders.get(i).getLankMarkId());
+                        dataList[i][8] = String.valueOf(userOrders.get(i).getPackageId());
+                        dataList[i][9] = String.valueOf(userOrders.get(i).getStatusFlag());
+                        dataList[i][10] = String.valueOf(userOrders.get(i).getPayTime());
+                        dataList[i][11] = String.valueOf(userOrders.get(i).getPayMode());
+                        dataList[i][12] = String.valueOf(userOrders.get(i).getRemark());
+                        dataList[i][13] = String.valueOf(userOrders.get(i).getShowFlag());
+                        dataList[i][14] = String.valueOf(userOrders.get(i).getTotlePrice());
+                        dataList[i][15] = String.valueOf(userOrders.get(i).getCash());
+                        dataList[i][16] = String.valueOf(userOrders.get(i).getPoint());
+                        dataList[i][17] = String.valueOf(userOrders.get(i).getDealPrice());
+                        dataList[i][18] = String.valueOf(userOrders.get(i).getMarketCode());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/pages/LandMarks.vue

@@ -89,7 +89,7 @@
 
       <!-- <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
       </el-table-column>-->
-      <el-table-column label="操作" align="center" fixed="right" width="230">
+      <el-table-column label="操作" align="left" fixed="right" width="230">
         <template slot-scope="scope">
           <!-- <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
             </el-button>
@@ -99,6 +99,7 @@
           </el-button>-->
           <el-button @click="$router.push({path:'/areaInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>区域</el-button>
           <el-button @click="$router.push({path:'/thingInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>事物</el-button>
+          <el-button @click="$router.push({path:'/navigationPackages',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>导航包</el-button>
           <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
           <el-button @click="newVersion(scope.row)" type="primary" size="mini" plain>发布</el-button>
           <el-button @click="drawMapInfo(scope.row)" type="primary" size="mini" plain>地图</el-button>

src/main/vue/src/pages/MarketCodeLog.vue

@@ -0,0 +1,117 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="userId" label="用户ID">
+                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="marketCode" label="推广码">
+                <el-input v-model="formData.marketCode" :disabled="'marketCode'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="marketUserId" label="推广用户">
+                <el-input v-model="formData.marketUserId" :disabled="'marketUserId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="totalPrice" label="价格">
+                <el-input v-model="formData.totalPrice" :disabled="'totalPrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/marketCodeLog/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                        },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                    subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/marketCodeLog/update' : '/marketCodeLog/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                    url: '/marketCodeLog/del',
+                    data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/MarketCodeLogs.vue

@@ -0,0 +1,487 @@
+<template>
+    <div>
+        <div class="filters-container">
+        
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/marketCodeLog',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table
+                :data="tableData"
+                :height="tableHeight"
+                row-key="id"
+                ref="table">
+            <el-table-column
+                    v-if="multipleMode"
+                    align="center"
+                    type="selection"
+                    width="50">
+            </el-table-column>
+            <el-table-column
+                    type="index"
+                    min-width="50"
+                    align="center">
+            </el-table-column>
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label="ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                                                                            
+                                            <el-table-column
+                                v-if="isColumnShow('userId')"
+                                prop="userId"
+                                label="用户ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('marketCode')"
+                                prop="marketCode"
+                                label="推广码"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('marketUserId')"
+                                prop="marketUserId"
+                                label="推广用户"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('totalPrice')"
+                                prop="totalPrice"
+                                label="价格"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: '用户ID',
+                                value: 'userId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '推广码',
+                                value: 'marketCode',
+                                show: true
+                            },
+                                                                                                {
+                                label: '推广用户',
+                                value: 'marketUserId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '价格',
+                                value: 'totalPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: '用户ID',
+                                value: 'user_id'
+                            },
+                                                                                                {
+                                label: '推广码',
+                                value: 'market_code'
+                            },
+                                                                                                {
+                                label: '推广用户',
+                                value: 'market_user_id'
+                            },
+                                                                                                {
+                                label: '价格',
+                                value: 'total_price'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/marketCodeLog/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/marketCodeLog',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
+
+                this.advancedQuerySearchKey = '';
+
+                if (this.advancedQueryFields.length > 0) {
+
+                    var templist = [];
+
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
+
+                this.orderByStr = '';
+
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/marketCodeLog/exportExcel?searchKey="
+                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/marketCodeLog/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
+
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
+
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
+
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/pages/NavigationPackage.vue

@@ -0,0 +1,158 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="landMarkId" label="地标ID">
+                <template>
+                    <el-select v-model="formData.landMarkId" clearable filterable placeholder="请选择" :disabled="'landMarkId'==subColumn">
+                        <el-option v-for="item in landMarkIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="name" label="标题">
+                <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="描述">
+                <el-input type="textarea" v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="payFlag" label="是否付费">
+                <el-switch v-model="formData.payFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'payFlag'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="price" label="价格">
+                <el-input type="number" v-model="formData.price" :disabled="'price'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="rank" label="排序">
+                <el-input type="number" v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="shelfFlag" label="是否上线">
+                <el-switch v-model="formData.shelfFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'shelfFlag'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/navigationPackage/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+
+                    this.formData.payFlag = this.formData.payFlag == 'Y' ? true : false;
+                    this.formData.shelfFlag = this.formData.shelfFlag == 'Y' ? true : false;
+
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+
+
+
+
+        this.$http.get({
+            url: '/landMark/noMapAll'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.landMarkIdOptions.push({ label: item.mapName, value: item.id });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                price: 0,
+                rank: 0
+            },
+            rules: {
+            },
+            landMarkIdOptions: [],
+            subColumn: '',
+            subValue: '',
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+
+            data.payFlag = this.formData.payFlag ? 'Y' : 'N';
+            data.shelfFlag = this.formData.shelfFlag ? 'Y' : 'N';
+
+            delete data.aimPlace;
+
+            this.$http.post({
+                url: this.formData.id ? '/navigationPackage/update' : '/navigationPackage/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/navigationPackage/del',
+                    data: { id: this.formData.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/NavigationPackageSelect.vue

@@ -0,0 +1,146 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="landMarkId" label="地标ID">
+                <el-input v-model="formData.landMarkId" :disabled="'landMarkId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="name" label="标题">
+                <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="aimPlace" label="点标">
+                <el-input v-model="formData.aimPlace" ></el-input>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/navigationPackage/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+
+
+                    this.getLandMarkInfo();
+
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+
+
+
+
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                price: 0,
+                rank: 0
+            },
+            rules: {
+            },
+            landMarkIdOptions: [],
+            subColumn: '',
+            subValue: '',
+            landMarkInfo: {},
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = {
+                id: this.formData.id,
+                aimPlace: this.formData.aimPlace
+            };
+
+            this.$http.post({
+                url: '/navigationPackage/update',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        getLandMarkInfo() {
+
+            if (this.formData.landMarkId) {
+
+                this.$http.get({
+                    url: '/landMark/mapInfo',
+                    data: {
+                        id: this.formData.landMarkId
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                        this.landMarkInfo = res.data;
+                    }
+                });
+            }
+
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/navigationPackage/del',
+                    data: { id: this.formData.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/NavigationPackages.vue

@@ -0,0 +1,466 @@
+<template>
+    <div>
+        <div class="filters-container">
+
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/navigationPackage',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('landMarkId')" prop="landMarkId" label="地标ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('name')" prop="name" label="标题" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="描述" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('payFlag')" prop="payFlag" label="是否付费" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('price')" prop="price" label="价格" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('shelfFlag')" prop="shelfFlag" label="是否上线" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="selectRow(scope.row)" type="primary" size="mini" plain>导游包</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '地标ID',
+                    value: 'landMarkId',
+                    show: true
+                },
+                {
+                    label: '标题',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '描述',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '是否付费',
+                    value: 'payFlag',
+                    show: true
+                },
+                {
+                    label: '价格',
+                    value: 'price',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+                {
+                    label: '是否上线',
+                    value: 'shelfFlag',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '地标ID',
+                    value: 'land_mark_id'
+                },
+                {
+                    label: '标题',
+                    value: 'name'
+                },
+                {
+                    label: '描述',
+                    value: 'remark'
+                },
+                {
+                    label: '是否付费',
+                    value: 'pay_flag'
+                },
+                {
+                    label: '价格',
+                    value: 'price'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+                {
+                    label: '是否上线',
+                    value: 'shelf_flag'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+            }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/navigationPackage/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/navigationPackage',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
+                }
+            })
+        },
+        selectRow(row) {
+            this.$router.push({
+                path: '/navigationPackageSelect',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
+                }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+
+            this.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/navigationPackage/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/navigationPackage/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/UserOrder.vue

@@ -0,0 +1,135 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="userId" label="用户ID">
+                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="lankMarkId" label="地标ID">
+                <el-input v-model="formData.lankMarkId" :disabled="'lankMarkId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="packageId" label="导游包ID">
+                <el-input v-model="formData.packageId" :disabled="'packageId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="statusFlag" label="状态">
+                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="payTime" label="支付时间">
+                <el-input v-model="formData.payTime" :disabled="'payTime'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="payMode" label="支付方式">
+                <el-input v-model="formData.payMode" :disabled="'payMode'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="showFlag" label="显示标识">
+                <el-input v-model="formData.showFlag" :disabled="'showFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="totlePrice" label="金额">
+                <el-input v-model="formData.totlePrice" :disabled="'totlePrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="dealPrice" label="成交">
+                <el-input v-model="formData.dealPrice" :disabled="'dealPrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="marketCode" label="推广码">
+                <el-input v-model="formData.marketCode" :disabled="'marketCode'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/userOrder/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                    subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/userOrder/update' : '/userOrder/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                    url: '/userOrder/del',
+                    data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/UserOrders.vue

@@ -0,0 +1,583 @@
+<template>
+    <div>
+        <div class="filters-container">
+        
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/userOrder',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table
+                :data="tableData"
+                :height="tableHeight"
+                row-key="id"
+                ref="table">
+            <el-table-column
+                    v-if="multipleMode"
+                    align="center"
+                    type="selection"
+                    width="50">
+            </el-table-column>
+            <el-table-column
+                    type="index"
+                    min-width="50"
+                    align="center">
+            </el-table-column>
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label="ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                                                                            
+                                            <el-table-column
+                                v-if="isColumnShow('userId')"
+                                prop="userId"
+                                label="用户ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('lankMarkId')"
+                                prop="lankMarkId"
+                                label="地标ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('packageId')"
+                                prop="packageId"
+                                label="导游包ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('statusFlag')"
+                                prop="statusFlag"
+                                label="状态"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('payTime')"
+                                prop="payTime"
+                                label="支付时间"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('payMode')"
+                                prop="payMode"
+                                label="支付方式"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('showFlag')"
+                                prop="showFlag"
+                                label="显示标识"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('totlePrice')"
+                                prop="totlePrice"
+                                label="金额"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                        
+                                            <el-table-column
+                                v-if="isColumnShow('dealPrice')"
+                                prop="dealPrice"
+                                label="成交"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('marketCode')"
+                                prop="marketCode"
+                                label="推广码"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: '用户ID',
+                                value: 'userId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '地标ID',
+                                value: 'lankMarkId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '导游包ID',
+                                value: 'packageId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '状态',
+                                value: 'statusFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '支付时间',
+                                value: 'payTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '支付方式',
+                                value: 'payMode',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: '显示标识',
+                                value: 'showFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '金额',
+                                value: 'totlePrice',
+                                show: true
+                            },
+                                                                                                                                                                                        {
+                                label: '成交',
+                                value: 'dealPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '推广码',
+                                value: 'marketCode',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: '用户ID',
+                                value: 'user_id'
+                            },
+                                                                                                {
+                                label: '地标ID',
+                                value: 'lank_mark_id'
+                            },
+                                                                                                {
+                                label: '导游包ID',
+                                value: 'package_id'
+                            },
+                                                                                                {
+                                label: '状态',
+                                value: 'status_flag'
+                            },
+                                                                                                {
+                                label: '支付时间',
+                                value: 'pay_time'
+                            },
+                                                                                                {
+                                label: '支付方式',
+                                value: 'pay_mode'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: '显示标识',
+                                value: 'show_flag'
+                            },
+                                                                                                {
+                                label: '金额',
+                                value: 'totle_price'
+                            },
+                                                                                                                                                                                        {
+                                label: '成交',
+                                value: 'deal_price'
+                            },
+                                                                                                {
+                                label: '推广码',
+                                value: 'market_code'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/userOrder/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/userOrder',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
+
+                this.advancedQuerySearchKey = '';
+
+                if (this.advancedQueryFields.length > 0) {
+
+                    var templist = [];
+
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
+
+                this.orderByStr = '';
+
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/userOrder/exportExcel?searchKey="
+                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/userOrder/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
+
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
+
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
+
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/router/index.js

@@ -609,6 +609,41 @@ const router = new Router({
                     path: '/landMarkVersions',
                     name: 'LandMarkVersions',
                     component: () => import('../pages/LandMarkVersions')
+                },
+                {
+                    path: '/navigationPackage',
+                    name: 'NavigationPackage',
+                    component: () => import('../pages/NavigationPackage')
+                },
+                {
+                    path: '/navigationPackages',
+                    name: 'NavigationPackages',
+                    component: () => import('../pages/NavigationPackages')
+                },
+                {
+                    path: '/navigationPackageSelect',
+                    name: 'NavigationPackageSelect',
+                    component: () => import('../pages/NavigationPackageSelect')
+                },
+                {
+                    path: '/userOrder',
+                    name: 'UserOrder',
+                    component: () => import('../pages/UserOrder')
+                },
+                {
+                    path: '/userOrders',
+                    name: 'UserOrders',
+                    component: () => import('../pages/UserOrders')
+                },
+                {
+                    path: '/marketCodeLog',
+                    name: 'MarketCodeLog',
+                    component: () => import('../pages/MarketCodeLog')
+                },
+                {
+                    path: '/marketCodeLogs',
+                    name: 'MarketCodeLogs',
+                    component: () => import('../pages/MarketCodeLogs')
                 }
                 /**INSERT_LOCATION**/
             ]