20190805店铺服务类型修改

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

@@ -28,6 +28,7 @@
         <result column="out_flag" property="outFlag" jdbcType="CHAR"/>
         <result column="down_payment" property="downPayment" jdbcType="DECIMAL"/>
         <result column="praise" property="praise" jdbcType="INTEGER"/>
+        <result column="amount" property="amount" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -83,6 +84,8 @@
 
             praise,
 
+            amount,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -177,6 +180,9 @@
             <if test="praise != null">
                 praise,
             </if>
+            <if test="amount != null">
+                amount,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -257,6 +263,9 @@
             <if test="praise != null">
                 #{praise},
             </if>
+            <if test="amount != null">
+                #{amount},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductInfo">
@@ -340,6 +349,9 @@
             <if test="praise != null">
                 praise = #{praise},
             </if>
+            <if test="amount != null">
+                amount = #{amount},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

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

@@ -42,6 +42,7 @@
         <result column="order_rate" property="orderRate" jdbcType="INTEGER"/>
         <result column="mini_id" property="miniId" jdbcType="VARCHAR"/>
         <result column="telephone" property="telephone" jdbcType="VARCHAR"/>
+        <result column="photo_price" property="photoPrice" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -118,6 +119,7 @@
             order_rate,
             mini_id,
             telephone,
+            photo_price,
 
         </trim>
     </sql>
@@ -255,6 +257,9 @@
             <if test="telephone!= null">
                 telephone,
             </if>
+            <if test="photoPrice!= null">
+                photo_price,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -377,6 +382,9 @@
             <if test="telephone != null">
                 #{telephone},
             </if>
+            <if test="photoPrice != null">
+                #{photoPrice},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.StoreInfo">
@@ -502,6 +510,9 @@
             <if test="telephone != null">
                 telephone = #{telephone,jdbcType=VARCHAR},
             </if>
+            <if test="photoPrice != null">
+                photo_price = #{photoPrice},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>

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

@@ -281,7 +281,7 @@
             </trim>
             ,
         </if>
-        id DESC
+       rank DESC, id DESC
     </select>
 
     <select id="queryAllStoreServiceLevel" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreServiceLevel">
@@ -383,7 +383,7 @@
             </trim>
             ,
         </if>
-        id DESC
+        rank DESC, id DESC
     </select>
 
     <select id="queryStoreServiceLevel" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreServiceLevel">

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

@@ -407,7 +407,7 @@
             </trim>
             ,
         </if>
-        id DESC
+        rank DESC,id DESC
     </select>
 
     <select id="queryAllStoreService" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreService">
@@ -545,7 +545,7 @@
             </trim>
             ,
         </if>
-        id DESC
+        rank DESC, id DESC
     </select>
 
     <select id="queryStoreService" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreService">

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

@@ -0,0 +1,35 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.StoreServiceType;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.StoreServiceTypeMapper")
+public interface StoreServiceTypeMapper{
+    /*generatedStart*/
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(StoreServiceType record);
+
+    StoreServiceType selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(StoreServiceType record);
+
+    List<StoreServiceType> queryAllStoreServiceType(StoreServiceType record);
+
+    List<StoreServiceType> queryStoreServiceTypeByPage(Map<String, Object> parameter);
+
+    int delete(StoreServiceType record);
+
+    StoreServiceType queryStoreServiceType(StoreServiceType record);
+
+    List<StoreServiceType> query(StoreServiceType record);
+    /*generatedEnd*/
+
+}
+

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

@@ -0,0 +1,472 @@
+<?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.StoreServiceTypeMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.StoreServiceType">
+        <!--generatedStart-->
+        <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="name" property="name" jdbcType="VARCHAR"/>
+        <result column="must_flag" property="mustFlag" jdbcType="CHAR"/>
+        <result column="sys_flag" property="sysFlag" jdbcType="CHAR"/>
+        <result column="user_id" property="userId" jdbcType="INTEGER"/>
+        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
+        <result column="mini_id" property="miniId" jdbcType="INTEGER"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <!--generatedEnd-->
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        <!--generatedStart-->
+        id, del_flag, update_time, update_user, create_time, create_user, name, must_flag, sys_flag, user_id, store_id, mini_id, rank, remark        <!--generatedEnd-->
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM store_service_type
+        WHERE id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        DELETE
+        FROM store_service_type
+        WHERE id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.StoreServiceType" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO store_service_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <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="name!= null">
+                name,
+            </if>
+            <if test="mustFlag!= null">
+                must_flag,
+            </if>
+            <if test="sysFlag!= null">
+                sys_flag,
+            </if>
+            <if test="userId!= null">
+                user_id,
+            </if>
+            <if test="storeId!= null">
+                store_id,
+            </if>
+            <if test="miniId!= null">
+                mini_id,
+            </if>
+            <if test="rank!= null">
+                rank,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <!--generatedEnd-->
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <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="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="mustFlag != null">
+                #{mustFlag,jdbcType=CHAR},
+            </if>
+            <if test="sysFlag != null">
+                #{sysFlag,jdbcType=CHAR},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=INTEGER},
+            </if>
+            <if test="storeId != null">
+                #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="miniId != null">
+                #{miniId,jdbcType=INTEGER},
+            </if>
+            <if test="rank != null">
+                #{rank,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <!--generatedEnd-->
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.StoreServiceType">
+        UPDATE store_service_type
+        <set>
+            <!--generatedStart-->
+            <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="name != null">
+                name= #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="mustFlag != null">
+                must_flag= #{mustFlag,jdbcType=CHAR},
+            </if>
+            <if test="sysFlag != null">
+                sys_flag= #{sysFlag,jdbcType=CHAR},
+            </if>
+            <if test="userId != null">
+                user_id= #{userId,jdbcType=INTEGER},
+            </if>
+            <if test="storeId != null">
+                store_id= #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="miniId != null">
+                mini_id= #{miniId,jdbcType=INTEGER},
+            </if>
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <!--generatedEnd-->
+        </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="queryStoreServiceTypeByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreServiceType">
+        SELECT <include refid="Base_Column_List"/> FROM store_service_type
+        <where>
+            AND del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                AND id IN (${record.idStr})
+            </if>
+            <!--generatedStart-->
+            <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.name != null and !&quot;&quot;.equals(record.name)">
+                AND name = #{record.name}
+            </if>
+            <if test="record.mustFlag != null and !&quot;&quot;.equals(record.mustFlag)">
+                AND must_flag = #{record.mustFlag}
+            </if>
+            <if test="record.sysFlag != null and !&quot;&quot;.equals(record.sysFlag)">
+                AND sys_flag = #{record.sysFlag}
+            </if>
+            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
+                AND user_id = #{record.userId}
+            </if>
+            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                AND store_id = #{record.storeId}
+            </if>
+            <if test="record.miniId != null and !&quot;&quot;.equals(record.miniId)">
+                AND mini_id = #{record.miniId}
+            </if>
+            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                AND rank = #{record.rank}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                AND remark = #{record.remark}
+            </if>
+            <!--generatedEnd-->
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR name LIKE concat('%',#{record.searchKey},'%')
+                    OR must_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    <!--generatedEnd-->
+                </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>
+       rank DESC, id DESC
+    </select>
+
+    <select id="queryAllStoreServiceType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreServiceType">
+        SELECT <include refid="Base_Column_List"/> FROM store_service_type
+        <where>
+            AND del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                AND id IN (${idStr})
+            </if>
+            <!--generatedStart-->
+            <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="name != null and !&quot;&quot;.equals(name)">
+                AND name = #{name}
+            </if>
+            <if test="mustFlag != null and !&quot;&quot;.equals(mustFlag)">
+                AND must_flag = #{mustFlag}
+            </if>
+            <if test="sysFlag != null and !&quot;&quot;.equals(sysFlag)">
+                AND sys_flag = #{sysFlag}
+            </if>
+            <if test="userId != null and !&quot;&quot;.equals(userId)">
+                AND user_id = #{userId}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                AND store_id = #{storeId}
+            </if>
+            <if test="miniId != null and !&quot;&quot;.equals(miniId)">
+                AND mini_id = #{miniId}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                AND rank = #{rank}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                AND remark = #{remark}
+            </if>
+            <!--generatedEnd-->
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR name LIKE concat('%',#{searchKey},'%')
+                    OR must_flag LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    <!--generatedEnd-->
+                </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>
+        rank DESC,id DESC
+    </select>
+
+    <select id="queryStoreServiceType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreServiceType">
+        SELECT <include refid="Base_Column_List"/> FROM store_service_type
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <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="name != null and !&quot;&quot;.equals(name)">
+                AND name = #{name}
+            </if>
+            <if test="mustFlag != null and !&quot;&quot;.equals(mustFlag)">
+                AND must_flag = #{mustFlag}
+            </if>
+            <if test="sysFlag != null and !&quot;&quot;.equals(sysFlag)">
+                AND sys_flag = #{sysFlag}
+            </if>
+            <if test="userId != null and !&quot;&quot;.equals(userId)">
+                AND user_id = #{userId}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                AND store_id = #{storeId}
+            </if>
+            <if test="miniId != null and !&quot;&quot;.equals(miniId)">
+                AND mini_id = #{miniId}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                AND rank = #{rank}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                AND remark = #{remark}
+            </if>
+            <!--generatedEnd-->
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE store_service_type 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.StoreServiceType">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM store_service_type
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <!--generatedEnd-->
+        </where>
+        ORDER BY id DESC
+    </select>
+</mapper>
+

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

@@ -47,17 +47,13 @@
         <result column="access_time" property="accessTime" jdbcType="TIMESTAMP"/>
         <result column="comment_time" property="commentTime" jdbcType="TIMESTAMP"/>
         <result column="tailor_flag" property="tailorFlag" jdbcType="CHAR"/>
+        <result column="photo_amount" property="photoAmount" jdbcType="INTEGER"/>
         <!--generatedEnd-->
     </resultMap>
 
     <sql id="Base_Column_List">
         <!--generatedStart-->
-        id, del_flag, update_time, update_user, create_time, create_user, user_id, order_code,
-        store_id, type_flag, product_id, product_name, down_payment, unit_price, quantity, off_price,
-        coupon_price, total_price, deal_price, pay_mode, pay_time, remark, show_flag, status_flag, fee, coin,
-        point, cash, user_address_id, service_id, message, use_type, order_id, tail_money, book_photo_time,
-        photo_time, book_select_time, select_time, book_check_time, check_time, book_access_time, access_time,
-        comment_time, tailor_flag        <!--generatedEnd-->
+        id, del_flag, update_time, update_user, create_time, create_user, user_id, order_code, store_id, type_flag, product_id, product_name, down_payment, unit_price, quantity, off_price, coupon_price, total_price, deal_price, pay_mode, pay_time, remark, show_flag, status_flag, fee, coin, point, cash, user_address_id, service_id, message, use_type, order_id, tail_money, book_photo_time, photo_time, book_select_time, select_time, book_check_time, check_time, book_access_time, access_time, comment_time, tailor_flag, photo_amount        <!--generatedEnd-->
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -210,6 +206,9 @@
             <if test="tailorFlag!= null">
                 tailor_flag,
             </if>
+            <if test="photoAmount!= null">
+                photo_amount,
+            </if>
             <!--generatedEnd-->
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -346,6 +345,9 @@
             <if test="tailorFlag != null">
                 #{tailorFlag,jdbcType=CHAR},
             </if>
+            <if test="photoAmount != null">
+                #{photoAmount,jdbcType=INTEGER},
+            </if>
             <!--generatedEnd-->
         </trim>
     </insert>
@@ -486,6 +488,9 @@
             <if test="tailorFlag != null">
                 tailor_flag= #{tailorFlag,jdbcType=CHAR},
             </if>
+            <if test="photoAmount != null">
+                photo_amount= #{photoAmount,jdbcType=INTEGER},
+            </if>
             <!--generatedEnd-->
         </set>
         WHERE
@@ -648,6 +653,9 @@
             <if test="record.tailorFlag != null and !&quot;&quot;.equals(record.tailorFlag)">
                 AND tailor_flag = #{record.tailorFlag}
             </if>
+            <if test="record.photoAmount != null and !&quot;&quot;.equals(record.photoAmount)">
+                AND photo_amount = #{record.photoAmount}
+            </if>
             <!--generatedEnd-->
 
             <if test="record.statusStr != null and !&quot;&quot;.equals(record.statusStr)">
@@ -685,6 +693,7 @@
                     OR order_id LIKE concat('%',#{record.searchKey},'%')
                     OR tail_money LIKE concat('%',#{record.searchKey},'%')
                     OR tailor_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR photo_amount LIKE concat('%',#{record.searchKey},'%')
                     <!--generatedEnd-->
                 </trim>
             </if>
@@ -873,6 +882,9 @@
             <if test="tailorFlag != null and !&quot;&quot;.equals(tailorFlag)">
                 AND tailor_flag = #{tailorFlag}
             </if>
+            <if test="photoAmount != null and !&quot;&quot;.equals(photoAmount)">
+                AND photo_amount = #{photoAmount}
+            </if>
             <!--generatedEnd-->
 
             <if test="statusStr != null and !&quot;&quot;.equals(statusStr)">
@@ -910,6 +922,7 @@
                     OR order_id LIKE concat('%',#{searchKey},'%')
                     OR tail_money LIKE concat('%',#{searchKey},'%')
                     OR tailor_flag LIKE concat('%',#{searchKey},'%')
+                    OR photo_amount LIKE concat('%',#{searchKey},'%')
                     <!--generatedEnd-->
                 </trim>
             </if>
@@ -1094,6 +1107,9 @@
             <if test="tailorFlag != null and !&quot;&quot;.equals(tailorFlag)">
                 AND tailor_flag = #{tailorFlag}
             </if>
+            <if test="photoAmount != null and !&quot;&quot;.equals(photoAmount)">
+                AND photo_amount = #{photoAmount}
+            </if>
             <!--generatedEnd-->
         </where>
         LIMIT 1

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

@@ -80,6 +80,8 @@ public class ProductInfo {
 
     private Integer commentNum;
 
+    private Integer amount;
+
     public Integer getId() {
         return this.id;
     }
@@ -375,5 +377,13 @@ public class ProductInfo {
     public void setCommentNum(Integer commentNum) {
         this.commentNum = commentNum;
     }
+
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
 }
 

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

@@ -134,6 +134,8 @@ public class StoreInfo {
 
     private String telephone;
 
+    private Integer photoPrice;
+
 
     public Integer getId() {
         return this.id;
@@ -584,5 +586,13 @@ public class StoreInfo {
     public void setTelephone(String telephone) {
         this.telephone = telephone;
     }
+
+    public Integer getPhotoPrice() {
+        return photoPrice;
+    }
+
+    public void setPhotoPrice(Integer photoPrice) {
+        this.photoPrice = photoPrice;
+    }
 }
 

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

@@ -0,0 +1,176 @@
+package com.izouma.awesomeadmin.model;
+
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class StoreServiceType{
+    /*generatedStart*/
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String name;
+    private String mustFlag;
+    private String sysFlag;
+    private Integer userId;
+    private Integer storeId;
+    private Integer miniId;
+    private Integer rank;
+    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;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    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 String getName(){
+        return this.name;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+    public String getMustFlag(){
+        return this.mustFlag;
+    }
+
+    public void setMustFlag(String mustFlag){
+        this.mustFlag = mustFlag;
+    }
+    public String getSysFlag(){
+        return this.sysFlag;
+    }
+
+    public void setSysFlag(String sysFlag){
+        this.sysFlag = sysFlag;
+    }
+    public Integer getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(Integer userId){
+        this.userId = userId;
+    }
+    public Integer getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(Integer storeId){
+        this.storeId = storeId;
+    }
+    public Integer getMiniId(){
+        return this.miniId;
+    }
+
+    public void setMiniId(Integer miniId){
+        this.miniId = miniId;
+    }
+    public Integer getRank(){
+        return this.rank;
+    }
+
+    public void setRank(Integer rank){
+        this.rank = rank;
+    }
+    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;
+    }
+    /*generatedEnd*/
+
+}
+

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

@@ -55,6 +55,7 @@ public class UserOrderDetail {
     private Date accessTime;
     private Date commentTime;
     private String tailorFlag;
+    private Integer photoAmount;
 
     private String idStr;
 
@@ -81,7 +82,6 @@ public class UserOrderDetail {
 
     private List<OrderService> orderServiceList;
 
-
     /*generatedStart*/
     public Integer getId() {
         return this.id;
@@ -435,6 +435,14 @@ public class UserOrderDetail {
         this.tailorFlag = tailorFlag;
     }
 
+    public Integer getPhotoAmount() {
+        return this.photoAmount;
+    }
+
+    public void setPhotoAmount(Integer photoAmount) {
+        this.photoAmount = photoAmount;
+    }
+
     public String getSearchKey() {
         return searchKey;
     }

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

@@ -0,0 +1,28 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.StoreServiceType;
+
+
+/**
+*  service接口类
+*/
+public interface StoreServiceTypeService{
+    /*generatedStart*/
+    List<StoreServiceType> getStoreServiceTypeList(StoreServiceType record);
+
+    List<StoreServiceType> getStoreServiceTypeByPage(Page page, StoreServiceType record);
+
+    StoreServiceType getStoreServiceTypeById(String id);
+
+    StoreServiceType getStoreServiceType(StoreServiceType record);
+
+    boolean createStoreServiceType(StoreServiceType record);
+
+    boolean deleteStoreServiceType(StoreServiceType record);
+
+    boolean updateStoreServiceType(StoreServiceType record);
+    /*generatedEnd*/
+}
+

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

@@ -0,0 +1,117 @@
+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.StoreServiceType;
+import com.izouma.awesomeadmin.service.StoreServiceTypeService;
+import com.izouma.awesomeadmin.dao.StoreServiceTypeMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class StoreServiceTypeServiceImpl implements StoreServiceTypeService{
+    /*generatedStart*/
+    private static Logger logger = Logger.getLogger(StoreServiceTypeServiceImpl.class);
+
+    @Autowired
+    private StoreServiceTypeMapper storeServiceTypeMapper;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @Override
+    public List<StoreServiceType> getStoreServiceTypeList(StoreServiceType record) {
+        logger.info("getStoreServiceTypeList");
+        try {
+            return storeServiceTypeMapper.queryAllStoreServiceType(record);
+        } catch (Exception e) {
+            logger.error("getStoreServiceTypeList", e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<StoreServiceType> getStoreServiceTypeByPage(Page page, StoreServiceType record) {
+        logger.info("getStoreServiceTypeByPage");
+        try {
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return storeServiceTypeMapper.queryStoreServiceTypeByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getStoreServiceTypeByPage", e);
+        }
+        return null;
+    }
+
+    @Override
+    public StoreServiceType getStoreServiceTypeById(String id) {
+        logger.info("getStoreServiceTypeyId");
+        try {
+            return storeServiceTypeMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            logger.error("getStoreServiceTypeById", e);
+        }
+        return null;
+    }
+
+    @Override
+    public StoreServiceType getStoreServiceType(StoreServiceType record) {
+        logger.info("getStoreServiceType");
+        try {
+            return storeServiceTypeMapper.queryStoreServiceType(record);
+        } catch (Exception e) {
+            logger.error("getStoreServiceType", e);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean createStoreServiceType(StoreServiceType record) {
+        logger.info("createStoreServiceType");
+        try {
+            int updates = storeServiceTypeMapper.insertSelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createStoreServiceType", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean deleteStoreServiceType(StoreServiceType record) {
+        logger.info("deleteStoreServiceType");
+        try {
+            int updates = storeServiceTypeMapper.delete(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteStoreServiceType", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean updateStoreServiceType(StoreServiceType record) {
+        logger.info("updateStoreServiceType");
+        try {
+            int updates = storeServiceTypeMapper.updateByPrimaryKeySelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateStoreServiceType", e);
+        }
+        return false;
+    }
+    /*generatedEnd*/
+}
+

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

@@ -0,0 +1,130 @@
+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.StoreServiceType;
+import com.izouma.awesomeadmin.service.StoreServiceTypeService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/storeServiceType")
+public class StoreServiceTypeController {
+    /*generatedStart*/
+    @Autowired
+    private StoreServiceTypeService storeServiceTypeService;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(StoreServiceType record) {
+        List<StoreServiceType> pp = storeServiceTypeService.getStoreServiceTypeList(record);
+        return new Result(true, pp);
+    }
+
+    @RequestMapping(value = "/getStoreServiceType", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getStoreServiceType(@RequestParam(required = false, value = "id") String id) {
+        StoreServiceType data = storeServiceTypeService.getStoreServiceTypeById(id);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(StoreServiceType record) {
+        StoreServiceType data = storeServiceTypeService.getStoreServiceType(record);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, StoreServiceType record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<StoreServiceType> pp =storeServiceTypeService.getStoreServiceTypeByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(StoreServiceType record) {
+        boolean num = storeServiceTypeService.createStoreServiceType(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateStoreServiceType(StoreServiceType record) {
+        boolean num = storeServiceTypeService.updateStoreServiceType(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteStoreServiceType(StoreServiceType record) {
+
+        boolean num = storeServiceTypeService.deleteStoreServiceType(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, StoreServiceType record) throws Exception {
+
+        List<StoreServiceType> storeServiceTypes = storeServiceTypeService.getStoreServiceTypeList(record);
+
+        String sheetName = "store_service_type";
+        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" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "必填" ,   "系统" ,   "用户" ,   "店铺" ,   "小程序" ,   "排序" ,   "备注"  };
+        String[][] dataList = new String[storeServiceTypes.size()][14];
+
+        for (int i = 0; i < storeServiceTypes.size(); i++) {
+                        dataList[i][0] = String.valueOf(storeServiceTypes.get(i).getId());
+                        dataList[i][1] = String.valueOf(storeServiceTypes.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(storeServiceTypes.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(storeServiceTypes.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(storeServiceTypes.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(storeServiceTypes.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(storeServiceTypes.get(i).getName());
+                        dataList[i][7] = String.valueOf(storeServiceTypes.get(i).getMustFlag());
+                        dataList[i][8] = String.valueOf(storeServiceTypes.get(i).getSysFlag());
+                        dataList[i][9] = String.valueOf(storeServiceTypes.get(i).getUserId());
+                        dataList[i][10] = String.valueOf(storeServiceTypes.get(i).getStoreId());
+                        dataList[i][11] = String.valueOf(storeServiceTypes.get(i).getMiniId());
+                        dataList[i][12] = String.valueOf(storeServiceTypes.get(i).getRank());
+                        dataList[i][13] = String.valueOf(storeServiceTypes.get(i).getRemark());
+                    }
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+    }
+    /*generatedEnd*/
+}
+

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

@@ -99,10 +99,10 @@ public class UserOrderDetailController {
         String sheetName = "user_order_detail";
         String titleName = "订单详情数据表";
         String fileName = "订单详情表";
-        int columnNumber = 44;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "订单号" ,   "店铺" ,   "类型" ,   "商品" ,   "商品名" ,   "定金" ,   "单价" ,   "数量" ,   "减价格" ,   "优惠价格" ,   "总价格" ,   "支付价格" ,   "支付方式" ,   "支付时间" ,   "备注" ,   "前端显示" ,   "状态" ,   "手续费" ,   "余额" ,   "积分" ,   "现金" ,   "地址Id" ,   "店铺服务" ,   "留言" ,   "消费方式" ,   "订单Id" ,   "尾款" ,   "预约拍照时间" ,   "拍照时间" ,   "预约选片时间" ,   "选片时间" ,   "预约审片时间" ,   "审片时间" ,   "预约取件时间" ,   "取件时间" ,   "评论时间" ,   "定制"  };
-        String[][] dataList = new String[userOrderDetails.size()][44];
+        int columnNumber = 45;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "订单号" ,   "店铺" ,   "类型" ,   "商品" ,   "商品名" ,   "定金" ,   "单价" ,   "数量" ,   "减价格" ,   "优惠价格" ,   "总价格" ,   "支付价格" ,   "支付方式" ,   "支付时间" ,   "备注" ,   "前端显示" ,   "状态" ,   "手续费" ,   "余额" ,   "积分" ,   "现金" ,   "地址Id" ,   "店铺服务" ,   "留言" ,   "消费方式" ,   "订单Id" ,   "尾款" ,   "预约拍照时间" ,   "拍照时间" ,   "预约选片时间" ,   "选片时间" ,   "预约审片时间" ,   "审片时间" ,   "预约取件时间" ,   "取件时间" ,   "评论时间" ,   "定制" ,   "相片数量"  };
+        String[][] dataList = new String[userOrderDetails.size()][45];
 
         for (int i = 0; i < userOrderDetails.size(); i++) {
                         dataList[i][0] = String.valueOf(userOrderDetails.get(i).getId());
@@ -149,6 +149,7 @@ public class UserOrderDetailController {
                         dataList[i][41] = String.valueOf(userOrderDetails.get(i).getAccessTime());
                         dataList[i][42] = String.valueOf(userOrderDetails.get(i).getCommentTime());
                         dataList[i][43] = String.valueOf(userOrderDetails.get(i).getTailorFlag());
+                        dataList[i][44] = String.valueOf(userOrderDetails.get(i).getPhotoAmount());
                     }
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,

src/main/vue/src/pages/HomeProductTypes.vue

@@ -1,7 +1,7 @@
 <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>
@@ -19,7 +19,7 @@
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据<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}}
@@ -28,92 +28,88 @@
             </el-dropdown>
         </div>
         <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="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
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+                             type="index"
+                             min-width="50"
+                             align="center">
             </el-table-column>
+
             <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+                             v-if="isColumnShow('id')"
+                             prop="id"
+                             label="ID"
+                             min-width="100">
             </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('typeFlag')"
-                                prop="typeFlag"
-                                label="类型"
-                                min-width="100">
-                                <template slot-scope="{row}">
+            <el-table-column
+                             v-if="isColumnShow('typeFlag')"
+                             prop="typeFlag"
+                             label="类型"
+                             min-width="100">
+                <template slot-scope="{row}">
                     {{row.typeFlag==0?'小图商品':'大图商品'}}
                 </template>
-                        </el-table-column>                                                                                                                                                                  
-                             
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('storeId')"
-                                prop="storeId"
-                                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('typeName')"
-                                prop="typeName"
-                                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>
+
+            <el-table-column
+                             v-if="isColumnShow('storeId')"
+                             prop="storeId"
+                             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('userId')"
-                                prop="userId"
-                                label="用户"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('miniId')"
-                                prop="miniId"
-                                label="小程序"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="200"
-            >
+            <el-table-column
+                             v-if="isColumnShow('typeName')"
+                             prop="typeName"
+                             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('userId')"
+                             prop="userId"
+                             label="用户"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('miniId')"
+                             prop="miniId"
+                             label="小程序"
+                             min-width="100">
+            </el-table-column>
+            <el-table-column
+                             label="操作"
+                             align="center"
+                             fixed="right"
+                             min-width="200">
                 <template slot-scope="scope">
-                                            <el-button @click="$router.push({path:'/HomeProducts',query:{column:scope.row.id+',typeId'}})" type="primary" size="small" plain>商品
-                        </el-button>
-                                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="$router.push({path:'/HomeProducts',query:{column:scope.row.id+',typeId'}})" type="primary" size="small" 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>
@@ -128,14 +124,14 @@
                 </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">
+                           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">
@@ -230,298 +226,312 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        name: 'HomeProductTypes',
-        created() {
+import { mapState } from 'vuex';
+import { format } from 'date-fns';
+import zh from 'date-fns/locale/zh_cn';
+
+export default {
+    name: 'HomeProductTypes',
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true,
+                },
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true,
+                },
+                {
+                    label: '小程序',
+                    value: 'miniId',
+                    show: true,
+                },
+                {
+                    label: '店铺',
+                    value: 'storeId',
+                    show: true,
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true,
+                },
+                {
+                    label: '名称',
+                    value: 'typeName',
+                    show: true,
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true,
+                },
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true,
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                },
+                {
+                    label: '用户',
+                    value: 'user_id',
+                },
+                {
+                    label: '小程序',
+                    value: 'mini_id',
+                },
+                {
+                    label: '店铺',
+                    value: 'store_id',
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                },
+                {
+                    label: '名称',
+                    value: 'type_name',
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                },
+                {
+                    label: '类型',
+                    value: 'type_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();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '用户',
-                                value: 'userId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '小程序',
-                                value: 'miniId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '店铺',
-                                value: 'storeId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank',
-                                show: true
-                            },
-                                                                                                {
-                                label: '名称',
-                                value: 'typeName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'typeFlag',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '用户',
-                                value: 'user_id'
-                            },
-                                                                                                {
-                                label: '小程序',
-                                value: 'mini_id'
-                            },
-                                                                                                {
-                                label: '店铺',
-                                value: 'store_id'
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank'
-                            },
-                                                                                                {
-                                label: '名称',
-                                value: 'type_name'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'type_flag'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        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];
             }
-        },
-        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({
+            this.$http
+                .get({
                     url: '/homeProductType/page',
-                    data: data
-                }).then(res => {
+                    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: '/homeProductType',
-                    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: '',
+        },
+        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: '/homeProductType',
+                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);
+                    }
                 });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
-                }
-            },
-            advancedQuery() {
-
-                this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
-
-                    var templist = [];
+                if (templist.length > 0) {
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
 
-                    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);
-                        }
-                    })
+            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 (templist.length > 0) {
+            if (this.tableSortFields.length > 0) {
+                var templist = [];
 
-                        this.advancedQuerySearchKey = templist.join('_;');
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
                     }
-                }
-
-                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('_;');
-                    }
+                if (templist.length > 0) {
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/homeProductType/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href =
+                this.$baseUrl +
+                '/homeProductType/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: '/homeProductType/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
+                        data: { id: row.id },
+                    });
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(action => {
+                })
+                .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;
-            },
-
-        }
-    }
+                });
+        },
+        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/StoreInfo.vue

@@ -64,6 +64,9 @@
             <el-form-item prop="telephone" label="联系电话">
                 <el-input v-model="formData.telephone"></el-input>
             </el-form-item>
+            <el-form-item prop="photoPrice" label="照片价格">
+                <el-input v-model="formData.photoPrice"></el-input>
+            </el-form-item>
             <!-- <el-form-item prop="credit" label="信誉等级">
                 <template>
                     <el-select v-model="formData.credit" clearable placeholder="请选择" :disabled="'credit'==subColumn">
@@ -193,40 +196,40 @@ export default {
             }
         }
 
-        this.$http
-            .get({
-                url: '/storeLabel/all',
-            })
-            .then(res => {
-                if (res.success) {
-                    this.storeLabels = res.data;
-                }
-            });
+        // this.$http
+        //     .get({
+        //         url: '/storeLabel/all',
+        //     })
+        //     .then(res => {
+        //         if (res.success) {
+        //             this.storeLabels = res.data;
+        //         }
+        //     });
 
-        this.$http
-            .get({
-                url: '/serviceType/all',
-            })
-            .then(res => {
-                if (res.success) {
-                    this.serviceTypes = res.data;
+        // this.$http
+        //     .get({
+        //         url: '/serviceType/all',
+        //     })
+        //     .then(res => {
+        //         if (res.success) {
+        //             this.serviceTypes = res.data;
 
-                    this.serviceTypes.forEach(element => {
-                        this.serviceTypeDetails[element.id] =
-                            element.serviceTypeDetailList;
-                    });
-                }
-            });
+        //             this.serviceTypes.forEach(element => {
+        //                 this.serviceTypeDetails[element.id] =
+        //                     element.serviceTypeDetailList;
+        //             });
+        //         }
+        //     });
 
-        this.$http
-            .get({
-                url: '/creditRating/all',
-            })
-            .then(res => {
-                if (res.success) {
-                    this.creditList = res.data;
-                }
-            });
+        // this.$http
+        //     .get({
+        //         url: '/creditRating/all',
+        //     })
+        //     .then(res => {
+        //         if (res.success) {
+        //             this.creditList = res.data;
+        //         }
+        //     });
     },
     data() {
         return {
@@ -243,6 +246,7 @@ export default {
                 serviceType: 1,
                 storelabel: [],
                 subclass: [],
+                photoPrice:10,
             },
             rules: {},
             creditOptions: [

src/main/vue/src/pages/StoreService.vue

@@ -5,7 +5,7 @@
             <el-form-item prop="typeFlag" label="类型">
                 <template>
                     <el-select v-model="formData.typeFlag" clearable placeholder="请选择" @change="changeTypeFlag" :disabled="'typeFlag'==subColumn">
-                        <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in typeFlagOptions" :key="String(item.id)" :label="item.name" :value="String(item.id)">
                         </el-option>
                     </el-select>
                 </template>
@@ -87,6 +87,16 @@ export default {
             this.subValue = this.$route.query.column.split(',')[0];
         }
 
+        this.$http
+            .get({
+                url: '/storeServiceType/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.typeFlagOptions = res.data;
+                }
+            });
+
         if (this.$route.query.id) {
             this.$http
                 .get({
@@ -134,32 +144,7 @@ export default {
                 storeFlag: false,
             },
             rules: {},
-            typeFlagOptions: [
-                {
-                    value: 'photographer',
-                    label: '摄影师',
-                },
-                {
-                    value: 'makeup_artist',
-                    label: '化妆师',
-                },
-                {
-                    value: 'clothing',
-                    label: '服装道具',
-                },
-                {
-                    value: 'album',
-                    label: '相框',
-                },
-                {
-                    value: 'other',
-                    label: '其他',
-                },
-                {
-                    value: 'song',
-                    label: '赠送增值',
-                },
-            ],
+            typeFlagOptions: [],
             typeLevelOptions: [],
             subColumn: '',
             subValue: '',
@@ -265,7 +250,6 @@ export default {
         changeTypeFlag() {
             if (this.formData.typeFlag) {
                 this.typeLevelOptions = [];
-
                 this.getTypeLevelOptions(this.formData.typeFlag);
             }
         },

src/main/vue/src/pages/StoreServiceLevel.vue

@@ -4,7 +4,7 @@
             <el-form-item prop="typeFlag" label="类型">
                 <template>
                     <el-select v-model="formData.typeFlag" clearable placeholder="请选择" :disabled="'typeFlag'==subColumn">
-                        <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in typeFlagOptions" :key="String(item.id)" :label="item.name" :value="String(item.id)">
                         </el-option>
                     </el-select>
                 </template>
@@ -70,38 +70,24 @@ export default {
                 this.formData[this.subColumn] = this.subValue;
             }
         }
+
+        this.$http
+            .get({
+                url: '/storeServiceType/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.typeFlagOptions = res.data;
+                }
+            });
+
     },
     data() {
         return {
             saving: false,
             formData: {},
             rules: {},
-            typeFlagOptions: [
-                {
-                    value: 'photographer',
-                    label: '摄影师',
-                },
-                {
-                    value: 'makeup_artist',
-                    label: '化妆师',
-                },
-                {
-                    value: 'clothing',
-                    label: '服装道具',
-                },
-                {
-                    value: 'album',
-                    label: '相框',
-                },
-                {
-                    value: 'other',
-                    label: '其他',
-                },
-                {
-                    value: 'song',
-                    label: '赠送增值',
-                },
-            ],
+            typeFlagOptions: [],
             subColumn: '',
             subValue: '',
         };

src/main/vue/src/pages/StoreServiceLevels.vue

@@ -3,7 +3,7 @@
         <div class="filters-container">
 
             <el-select v-model="typeFlag" clearable filterable placeholder="类型" @change="searchData" size="small" style="width:120px">
-                <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in typeFlagOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
             </el-select>
 
@@ -60,7 +60,8 @@
                              v-if="isColumnShow('typeFlag')"
                              prop="typeFlag"
                              label="类型"
-                             min-width="100">
+                             min-width="100"
+                             :formatter="TypeFlagFormatter">
             </el-table-column>
 
             <el-table-column
@@ -108,8 +109,10 @@
                              label="操作"
                              align="center"
                              fixed="right"
-                             min-width="150">
+                             min-width="220">
                 <template slot-scope="scope">
+                     <el-button @click="$router.push({path:'/storeServices',query:{column:scope.row.id+',typeLevel'}})" type="primary" size="small" 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>
@@ -235,6 +238,15 @@ export default {
     name: 'StoreServiceLevels',
     created() {
         this.getData();
+        this.$http
+            .get({
+                url: '/storeServiceType/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.typeFlagOptions = res.data;
+                }
+            });
     },
     data() {
         return {
@@ -331,32 +343,7 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
-            typeFlagOptions: [
-                {
-                    value: 'photographer',
-                    label: '摄影师',
-                },
-                {
-                    value: 'makeup_artist',
-                    label: '化妆师',
-                },
-                {
-                    value: 'clothing',
-                    label: '服装道具',
-                },
-                {
-                    value: 'album',
-                    label: '相框',
-                },
-                {
-                    value: 'other',
-                    label: '其他',
-                },
-                {
-                    value: 'song',
-                    label: '赠送增值',
-                },
-            ],
+            typeFlagOptions: [],
             typeFlag: '',
         };
     },
@@ -559,6 +546,16 @@ export default {
             this.imgSrc = img;
             this.imageDialogVisible = true;
         },
+        TypeFlagFormatter(row, column, cellValue) {
+            var valueStr = '';
+            this.typeFlagOptions.forEach(item => {
+                if (item.id == cellValue) {
+                    valueStr = item.name;
+                }
+            });
+
+            return valueStr;
+        },
     },
 };
 </script>

src/main/vue/src/pages/StoreServiceType.vue

@@ -0,0 +1,196 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
+                 style="max-width: 500px;">
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="mustFlag" label="必填">
+                <el-switch
+                           v-model="formData.mustFlag"
+                           :disabled="'mustFlag'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="sysFlag" label="系统">
+                <el-switch
+                           v-model="formData.sysFlag"
+                           :disabled="'sysFlag'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="userId" label="用户">
+                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="storeId" label="店铺">
+                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="miniId" label="小程序">
+                <el-input v-model="formData.miniId" :disabled="'miniId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="rank" label="排序">
+                <el-input v-model="formData.rank" :disabled="'rank'==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';
+import { mapState } from 'vuex';
+import { format } from 'date-fns';
+import zh from 'date-fns/locale/zh_cn';
+
+export default {
+    name: 'StoreServiceType',
+    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: '/storeServiceType/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.mustFlag =
+                            this.formData.mustFlag == 'Y' ? true : false;
+                        this.formData.sysFlag =
+                            this.formData.sysFlag == 'Y' ? true : false;
+                    }
+                });
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                mustFlag: false,
+                sysFlag: false,
+                rank: 0,
+            },
+            rules: {},
+            subColumn: '',
+            subValue: '',
+        };
+    },
+    computed: {
+        ...mapState(['userInfo']),
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.logicalValidate();
+                } else {
+                    return false;
+                }
+            });
+        },
+        logicalValidate() {
+            let logicalData = {};
+
+            if (JSON.stringify(logicalData) == '{}') {
+                this.submit();
+            } else {
+                this.$http
+                    .get({
+                        url: '/storeServiceType/getOne',
+                        data: logicalData,
+                    })
+                    .then(res => {
+                        if (res.success) {
+                            let logicalFlag = true;
+                            if (res.data) {
+                                if (this.formData.id) {
+                                    if (res.data.id != this.formData.id) {
+                                        logicalFlag = false;
+                                    }
+                                } else {
+                                    logicalFlag = false;
+                                }
+                            }
+
+                            if (logicalFlag) {
+                                this.submit();
+                            } else {
+                                this.$message.warning(
+                                    '逻辑关键字:' + '' + '验证失败',
+                                );
+                            }
+                        } else {
+                            this.$message.warning(
+                                '逻辑关键字:' + '' + '验证失败',
+                            );
+                        }
+                    });
+            }
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            data.mustFlag = this.formData.mustFlag ? 'Y' : 'N';
+            data.sysFlag = this.formData.sysFlag ? 'Y' : 'N';
+
+            this.$http
+                .post({
+                    url: this.formData.id
+                        ? '/storeServiceType/update'
+                        : '/storeServiceType/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: '/storeServiceType/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/StoreServiceTypes.vue

@@ -0,0 +1,551 @@
+<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:'/storeServiceType',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('name')"
+                             prop="name"
+                             label="名称"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('mustFlag')"
+                             prop="mustFlag"
+                             label="必填"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('sysFlag')"
+                             prop="sysFlag"
+                             label="系统"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('userId')"
+                             prop="userId"
+                             label="用户"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('storeId')"
+                             prop="storeId"
+                             label="店铺"
+                             min-width="100">
+            </el-table-column>
+
+            <el-table-column
+                             v-if="isColumnShow('miniId')"
+                             prop="miniId"
+                             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('remark')"
+                             prop="remark"
+                             label="备注"
+                             min-width="100">
+            </el-table-column>
+            <el-table-column
+                             label="操作"
+                             align="center"
+                             fixed="right"
+                             min-width="220">
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/storeServiceLevels',query:{column:scope.row.id+',typeFlag'}})" type="primary" size="small" 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 {
+    name: 'StoreServiceTypes',
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true,
+                },
+                {
+                    label: '名称',
+                    value: 'name',
+                    show: true,
+                },
+                {
+                    label: '必填',
+                    value: 'mustFlag',
+                    show: true,
+                },
+                {
+                    label: '系统',
+                    value: 'sysFlag',
+                    show: true,
+                },
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true,
+                },
+                {
+                    label: '店铺',
+                    value: 'storeId',
+                    show: true,
+                },
+                {
+                    label: '小程序',
+                    value: 'miniId',
+                    show: true,
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true,
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true,
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                },
+                {
+                    label: '名称',
+                    value: 'name',
+                },
+                {
+                    label: '必填',
+                    value: 'must_flag',
+                },
+                {
+                    label: '系统',
+                    value: 'sys_flag',
+                },
+                {
+                    label: '用户',
+                    value: 'user_id',
+                },
+                {
+                    label: '店铺',
+                    value: 'store_id',
+                },
+                {
+                    label: '小程序',
+                    value: 'mini_id',
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                },
+                {
+                    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: '/storeServiceType/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: '/storeServiceType',
+                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 +
+                '/storeServiceType/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: '/storeServiceType/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/StoreServices.vue

@@ -3,7 +3,7 @@
         <div class="filters-container">
 
             <el-select v-model="typeFlag" clearable filterable placeholder="类型" @change="typeFlagChange" size="small" style="width:120px">
-                <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in typeFlagOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
             </el-select>
 
@@ -313,6 +313,15 @@ export default {
     name: 'StoreServices',
     created() {
         this.getData();
+        this.$http
+            .get({
+                url: '/storeServiceType/all',
+            })
+            .then(res => {
+                if (res.success) {
+                    this.typeFlagOptions = res.data;
+                }
+            });
         this.changeTypeFlag();
     },
     data() {
@@ -491,32 +500,7 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
-            typeFlagOptions: [
-                {
-                    value: 'photographer',
-                    label: '摄影师',
-                },
-                {
-                    value: 'makeup_artist',
-                    label: '化妆师',
-                },
-                {
-                    value: 'clothing',
-                    label: '服装道具',
-                },
-                {
-                    value: 'album',
-                    label: '相框',
-                },
-                {
-                    value: 'other',
-                    label: '其他',
-                },
-                {
-                    value: 'song',
-                    label: '赠送增值',
-                },
-            ],
+            typeFlagOptions: [],
             typeFlag: '',
             typeLevelOptions: [],
             typeLevel: '',
@@ -750,8 +734,8 @@ export default {
         TypeFlagFormatter(row, column, cellValue) {
             var valueStr = '';
             this.typeFlagOptions.forEach(item => {
-                if (item.value == cellValue) {
-                    valueStr = item.label;
+                if (item.id == cellValue) {
+                    valueStr = item.name;
                 }
             });
 

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

@@ -762,6 +762,16 @@ const router = new Router({
                     path: '/homeProducts',
                     name: 'HomeProducts',
                     component: () => import('../pages/HomeProducts')
+                },
+                {
+                    path: '/storeServiceType',
+                    name: 'StoreServiceType',
+                    component: () => import('../pages/StoreServiceType')
+                },
+                {
+                    path: '/storeServiceTypes',
+                    name: 'StoreServiceTypes',
+                    component: () => import('../pages/StoreServiceTypes')
                 }
                 /**INSERT_LOCATION**/
         ]