订单图片

log.txt

@@ -32,3 +32,7 @@
 [2018-08-27 14:30:57] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
 [2018-08-27 14:31:13] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
 [2018-08-27 14:32:17] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
+[2018-09-03 16:10:11] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
+[2018-09-03 16:12:59] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
+[2018-09-03 16:14:31] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
+[2018-09-03 16:19:40] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.

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

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

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

@@ -0,0 +1,505 @@
+<?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.ImageUploadLogMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ImageUploadLog" >
+                <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="image_name" property="imageName" jdbcType="VARCHAR" />
+                                <result column="url" property="url" jdbcType="VARCHAR" />
+                                <result column="store_id" property="storeId" jdbcType="VARCHAR" />
+                                <result column="order_id" property="orderId" jdbcType="VARCHAR" />
+                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
+                                <result column="type_flag" property="typeFlag" jdbcType="VARCHAR" />
+                                <result column="image_size" property="imageSize" jdbcType="DECIMAL" />
+                                <result column="use_flag" property="useFlag" jdbcType="CHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            image_name,
+
+            url,
+
+            store_id,
+
+            order_id,
+
+            user_id,
+
+            type_flag,
+
+            image_size,
+
+            use_flag,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from image_upload_log
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from image_upload_log
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ImageUploadLog" useGeneratedKeys="true" keyProperty="id">
+        insert into image_upload_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id!= null" >
+                id,
+            </if>
+                <if test="delFlag!= null" >
+                del_flag,
+            </if>
+                <if test="updateTime!= null" >
+                update_time,
+            </if>
+                <if test="updateUser!= null" >
+                update_user,
+            </if>
+                <if test="createTime!= null" >
+                create_time,
+            </if>
+                <if test="createUser!= null" >
+                create_user,
+            </if>
+                <if test="imageName!= null" >
+                image_name,
+            </if>
+                <if test="url!= null" >
+                url,
+            </if>
+                <if test="storeId!= null" >
+                store_id,
+            </if>
+                <if test="orderId!= null" >
+                order_id,
+            </if>
+                <if test="userId!= null" >
+                user_id,
+            </if>
+                <if test="typeFlag!= null" >
+                type_flag,
+            </if>
+                <if test="imageSize!= null" >
+                image_size,
+            </if>
+                <if test="useFlag!= null" >
+                use_flag,
+            </if>
+            </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+                    <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+                    <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </if>
+                    <if test="updateTime != null" >
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="updateUser != null" >
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="createUser != null" >
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="imageName != null" >
+                #{imageName,jdbcType=VARCHAR},
+            </if>
+                    <if test="url != null" >
+                #{url,jdbcType=VARCHAR},
+            </if>
+                    <if test="storeId != null" >
+                #{storeId,jdbcType=VARCHAR},
+            </if>
+                    <if test="orderId != null" >
+                #{orderId,jdbcType=VARCHAR},
+            </if>
+                    <if test="userId != null" >
+                #{userId,jdbcType=VARCHAR},
+            </if>
+                    <if test="typeFlag != null" >
+                #{typeFlag,jdbcType=VARCHAR},
+            </if>
+                    <if test="imageSize != null" >
+                #{imageSize,jdbcType=DECIMAL},
+            </if>
+                    <if test="useFlag != null" >
+                #{useFlag,jdbcType=CHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ImageUploadLog" >
+        update image_upload_log
+        <set >
+                    <if test="id != null" >
+               id= #{id,jdbcType=INTEGER},
+            </if>
+                     <if test="delFlag != null" >
+               del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+                     <if test="updateTime != null" >
+               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="updateUser != null" >
+               update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="createTime != null" >
+               create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="createUser != null" >
+               create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="imageName != null" >
+               image_name= #{imageName,jdbcType=VARCHAR},
+            </if>
+                     <if test="url != null" >
+               url= #{url,jdbcType=VARCHAR},
+            </if>
+                     <if test="storeId != null" >
+               store_id= #{storeId,jdbcType=VARCHAR},
+            </if>
+                     <if test="orderId != null" >
+               order_id= #{orderId,jdbcType=VARCHAR},
+            </if>
+                     <if test="userId != null" >
+               user_id= #{userId,jdbcType=VARCHAR},
+            </if>
+                     <if test="typeFlag != null" >
+               type_flag= #{typeFlag,jdbcType=VARCHAR},
+            </if>
+                     <if test="imageSize != null" >
+               image_size= #{imageSize,jdbcType=DECIMAL},
+            </if>
+                     <if test="useFlag != null" >
+               use_flag= #{useFlag,jdbcType=CHAR},
+            </if>
+                 </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <select id="queryImageUploadLogByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ImageUploadLog">
+        select <include refid="Base_Column_List"/> from image_upload_log
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and  id = #{record.id}
+            </if>
+                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and  del_flag = #{record.delFlag}
+            </if>
+                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and  update_time = #{record.updateTime}
+            </if>
+                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and  update_user = #{record.updateUser}
+            </if>
+                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and  create_time = #{record.createTime}
+            </if>
+                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and  create_user = #{record.createUser}
+            </if>
+                     <if test="record.imageName != null and !&quot;&quot;.equals(record.imageName)">
+                and  image_name = #{record.imageName}
+            </if>
+                     <if test="record.url != null and !&quot;&quot;.equals(record.url)">
+                and  url = #{record.url}
+            </if>
+                     <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                and  store_id = #{record.storeId}
+            </if>
+                     <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
+                and  order_id = #{record.orderId}
+            </if>
+                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
+                and  user_id = #{record.userId}
+            </if>
+                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
+                and  type_flag = #{record.typeFlag}
+            </if>
+                     <if test="record.imageSize != null and !&quot;&quot;.equals(record.imageSize)">
+                and  image_size = #{record.imageSize}
+            </if>
+                     <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
+                and  use_flag = #{record.useFlag}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  image_name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  url LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  store_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  order_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  image_size LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  use_flag LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllImageUploadLog" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ImageUploadLog">
+        select <include refid="Base_Column_List"/> from image_upload_log
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and  id = #{id}
+            </if>
+                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and  del_flag = #{delFlag}
+            </if>
+                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and  update_time = #{updateTime}
+            </if>
+                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and  update_user = #{updateUser}
+            </if>
+                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and  create_time = #{createTime}
+            </if>
+                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and  create_user = #{createUser}
+            </if>
+                    <if test="imageName != null and !&quot;&quot;.equals(imageName)">
+                and  image_name = #{imageName}
+            </if>
+                    <if test="url != null and !&quot;&quot;.equals(url)">
+                and  url = #{url}
+            </if>
+                    <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and  store_id = #{storeId}
+            </if>
+                    <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                and  order_id = #{orderId}
+            </if>
+                    <if test="userId != null and !&quot;&quot;.equals(userId)">
+                and  user_id = #{userId}
+            </if>
+                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and  type_flag = #{typeFlag}
+            </if>
+                    <if test="imageSize != null and !&quot;&quot;.equals(imageSize)">
+                and  image_size = #{imageSize}
+            </if>
+                    <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+                and  use_flag = #{useFlag}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  image_name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  url LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  store_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  order_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  user_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  type_flag LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  image_size LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  use_flag LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryImageUploadLog" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ImageUploadLog">
+        select <include refid="Base_Column_List"/> from image_upload_log
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+                     <if test="imageName != null and !&quot;&quot;.equals(imageName)">
+                and image_name = #{imageName}
+            </if>
+                     <if test="url != null and !&quot;&quot;.equals(url)">
+                and url = #{url}
+            </if>
+                     <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+                     <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                and order_id = #{orderId}
+            </if>
+                     <if test="userId != null and !&quot;&quot;.equals(userId)">
+                and user_id = #{userId}
+            </if>
+                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
+            </if>
+                     <if test="imageSize != null and !&quot;&quot;.equals(imageSize)">
+                and image_size = #{imageSize}
+            </if>
+                     <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+                and use_flag = #{useFlag}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE image_upload_log SET del_flag = 'Y'
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ImageUploadLog">
+        select <include refid="Base_Column_List"/> from image_upload_log
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
+</mapper>
+

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

@@ -18,6 +18,7 @@
         <result column="deal_user" property="dealUser" jdbcType="VARCHAR"/>
         <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="image_name" property="imageName" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -53,6 +54,8 @@
 
             remark,
 
+            image_name,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -117,6 +120,9 @@
             <if test="remark!= null">
                 remark,
             </if>
+            <if test="imageName!= null">
+                image_name,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -167,6 +173,9 @@
             <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
+            <if test="imageName != null">
+                #{imageName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderImage">
@@ -220,11 +229,14 @@
             <if test="remark != null">
                 remark= #{remark,jdbcType=VARCHAR},
             </if>
+            <if test="imageName != null">
+                image_name= #{imageName,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
     <select id="queryOrderImageByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderImage">
+            resultMap="AllInfoForGetOne">
         select
         <include refid="Base_Column_List"/>
 
@@ -251,7 +263,7 @@
         <where>
             and del_flag = 'N'
             <if test="record.baseRepairId != null and !&quot;&quot;.equals(record.baseRepairId)">
-                and  id in ( SELECT image_id FROM order_repair_detail WHERE repair_id = #{record.baseRepairId})
+                and id in ( SELECT image_id FROM order_repair_detail WHERE repair_id = #{record.baseRepairId})
             </if>
             <if test="record.id != null and !&quot;&quot;.equals(record.id)">
                 and id = #{record.id}
@@ -488,7 +500,7 @@
 
         id desc
     </select>
-    <select id="queryOrderImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
+    <select id="queryOrderImage" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
         select
         <include refid="Base_Column_List"/>
         from order_image
@@ -561,5 +573,22 @@
         </where>
         order by id desc
     </select>
+
+    <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.OrderImage" extends="BaseResultMap">
+
+
+        <association property="originalImageInfo"
+                     javaType="com.izouma.awesomeadmin.model.ImageUploadLog"
+                     select="com.izouma.awesomeadmin.dao.ImageUploadLogMapper.queryImageUploadLog"
+                     column="{ id = original_image }"/>
+
+        <association property="finishedImageInfo"
+                     javaType="com.izouma.awesomeadmin.model.ImageUploadLog"
+                     select="com.izouma.awesomeadmin.dao.ImageUploadLogMapper.queryImageUploadLog"
+                     column="{ id = finished_image }"/>
+
+
+    </resultMap>
+
 </mapper>
 

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

@@ -0,0 +1,173 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ImageUploadLog{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String imageName;
+    private String url;
+    private String storeId;
+    private String orderId;
+    private String userId;
+    private String typeFlag;
+    private BigDecimal imageSize;
+    private String useFlag;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public String getImageName(){
+        return this.imageName;
+    }
+
+    public void setImageName(String imageName){
+        this.imageName = imageName;
+    }
+    public String getUrl(){
+        return this.url;
+    }
+
+    public void setUrl(String url){
+        this.url = url;
+    }
+    public String getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(String storeId){
+        this.storeId = storeId;
+    }
+    public String getOrderId(){
+        return this.orderId;
+    }
+
+    public void setOrderId(String orderId){
+        this.orderId = orderId;
+    }
+    public String getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(String userId){
+        this.userId = userId;
+    }
+    public String getTypeFlag(){
+        return this.typeFlag;
+    }
+
+    public void setTypeFlag(String typeFlag){
+        this.typeFlag = typeFlag;
+    }
+    public BigDecimal getImageSize(){
+        return this.imageSize;
+    }
+
+    public void setImageSize(BigDecimal imageSize){
+        this.imageSize = imageSize;
+    }
+    public String getUseFlag(){
+        return this.useFlag;
+    }
+
+    public void setUseFlag(String useFlag){
+        this.useFlag = useFlag;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

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

@@ -26,6 +26,12 @@ public class OrderImage {
     private String dealUser;
     private Integer statusFlag;
 
+    private String imageName;
+
+    private ImageUploadLog originalImageInfo;
+
+    private ImageUploadLog finishedImageInfo;
+
     /**
      * 图片备注
      */
@@ -246,5 +252,29 @@ public class OrderImage {
     public void setBaseRepairId(String baseRepairId) {
         this.baseRepairId = baseRepairId;
     }
+
+    public String getImageName() {
+        return imageName;
+    }
+
+    public void setImageName(String imageName) {
+        this.imageName = imageName;
+    }
+
+    public ImageUploadLog getOriginalImageInfo() {
+        return originalImageInfo;
+    }
+
+    public void setOriginalImageInfo(ImageUploadLog originalImageInfo) {
+        this.originalImageInfo = originalImageInfo;
+    }
+
+    public ImageUploadLog getFinishedImageInfo() {
+        return finishedImageInfo;
+    }
+
+    public void setFinishedImageInfo(ImageUploadLog finishedImageInfo) {
+        this.finishedImageInfo = finishedImageInfo;
+    }
 }
 

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.ImageUploadLog;
+
+
+/**
+*  service接口类
+*/
+public interface ImageUploadLogService{
+
+    List<ImageUploadLog> getImageUploadLogList(ImageUploadLog record);
+
+    List<ImageUploadLog> getImageUploadLogByPage(Page page, ImageUploadLog record);
+
+    ImageUploadLog getImageUploadLogById(String id);
+
+    ImageUploadLog getImageUploadLog(ImageUploadLog record);
+
+    boolean createImageUploadLog(ImageUploadLog record);
+
+    boolean deleteImageUploadLog(String id);
+
+    boolean updateImageUploadLog(ImageUploadLog record);
+}
+

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

@@ -26,5 +26,7 @@ public interface MemberCoinService {
     boolean updateMemberCoin(MemberCoin record);
 
     void alipaySuccess(String tradeNo, String tradeStatus);
+
+    int song(MemberCoin memberCoin);
 }
 

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

@@ -3,26 +3,28 @@ package com.izouma.awesomeadmin.service;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Random;
 
+import com.aliyun.oss.model.*;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Service;
 
 import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.model.OSSObject;
-import com.aliyun.oss.model.ObjectMetadata;
-import com.aliyun.oss.model.PutObjectResult;
 import com.izouma.awesomeadmin.util.ImagesUtil;
 import com.izouma.awesomeadmin.util.PropertiesFileLoader;
 
+
 @Service
 public class OSSFileService {
 
     /**
      * 日志对象
      */
-    private static       Logger logger      = Logger.getLogger(OSSFileService.class);
+    private static Logger logger = Logger.getLogger(OSSFileService.class);
     private static final String projectName = PropertiesFileLoader.getProperties("projectname");
 
     public String upload(InputStream fin, String path) {
@@ -87,4 +89,27 @@ public class OSSFileService {
         return null;
     }
 
+
+    /**
+     * @param objectName 不包含 bucketname 的 path
+     */
+    public void deleteObject(String objectName) {
+
+        if (StringUtils.isNotEmpty(objectName)) {
+            String aliid = PropertiesFileLoader.getDefaultProperties("aliossid", "");
+            String alikey = PropertiesFileLoader.getDefaultProperties("aliosskey", "");
+            String aliossendpoit = PropertiesFileLoader.getDefaultProperties("aliossendpoit", "");
+            String bucketname = PropertiesFileLoader.getDefaultProperties("alibucketname", "");
+            logger.info(String.format("OSS 删除:\naliid: %s\nalikey: %s\naliossendpoit: %s\nbucketname: %s\npath: %s", aliid, alikey, aliossendpoit, bucketname, objectName));
+
+            OSSClient client = new OSSClient(aliossendpoit, aliid, alikey);
+            // 删除文件。
+            client.deleteObject(bucketname, objectName);
+
+            // 关闭OSSClient。
+            client.shutdown();
+        }
+    }
+
+
 }

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

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.ImageUploadLog;
+import com.izouma.awesomeadmin.service.ImageUploadLogService;
+import com.izouma.awesomeadmin.dao.ImageUploadLogMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class ImageUploadLogServiceImpl implements ImageUploadLogService{
+
+    private static Logger logger = Logger.getLogger(ImageUploadLogServiceImpl.class);
+
+    @Autowired
+    private ImageUploadLogMapper imageUploadLogMapper;
+
+    @Override
+    public List<ImageUploadLog> getImageUploadLogList(ImageUploadLog record) {
+
+        logger.info("getImageUploadLogList");
+        try {
+
+        return imageUploadLogMapper.queryAllImageUploadLog(record);
+        } catch (Exception e) {
+        logger.error("getImageUploadLogList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<ImageUploadLog> getImageUploadLogByPage(Page page, ImageUploadLog record) {
+
+        logger.info("getImageUploadLogByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return imageUploadLogMapper.queryImageUploadLogByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getImageUploadLogByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ImageUploadLog getImageUploadLogById(String id) {
+
+        logger.info("getImageUploadLogyId");
+        try {
+
+            return imageUploadLogMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getImageUploadLogById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ImageUploadLog getImageUploadLog(ImageUploadLog record) {
+
+        logger.info("getImageUploadLog");
+        try {
+
+            return imageUploadLogMapper.queryImageUploadLog(record);
+        } catch (Exception e) {
+        logger.error("getImageUploadLog", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createImageUploadLog(ImageUploadLog record) {
+
+        logger.info("createImageUploadLog");
+        try {
+
+            int updates = imageUploadLogMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createImageUploadLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteImageUploadLog(String id) {
+
+        logger.info("deleteImageUploadLog");
+        try {
+
+             int updates = imageUploadLogMapper.delete(id);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteImageUploadLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateImageUploadLog(ImageUploadLog record) {
+
+        logger.info("updateImageUploadLog");
+        try {
+
+            int updates = imageUploadLogMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateImageUploadLog", e);
+        }
+
+        return false;
+    }
+}
+

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

@@ -199,5 +199,46 @@ public class MemberCoinServiceImpl implements MemberCoinService {
 
     }
 
+
+    @Override
+    public int song(MemberCoin memberCoin) {
+
+        logger.info("song：送电子币  ");
+        try {
+
+            int key = 0;
+
+            double money = Double.valueOf(memberCoin.getMoney());
+
+
+            int userId = Integer.valueOf(memberCoin.getUserId());
+            UserInfo userInfo = userInfoService.getUserInfoById(userId + "");
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userId);
+
+
+            double balance = userInfo.getMoneyCoin();
+            double moneyCoin = balance + money;
+
+            memberCoin.setCreateUser("管理员");
+            memberCoin.setBalance(String.valueOf(moneyCoin));
+            memberCoin.setTypeFlag(AppConstant.CoinType.SONG);
+            memberCoin.setRemark("后台赠送：" + money + "余额");
+            key += memberCoinMapper.insertSelective(memberCoin);
+
+
+            updateUser.setMoneyCoin(moneyCoin);
+            userInfoService.updateUserInfo(updateUser);
+
+
+            return key;
+        } catch (Exception e) {
+            logger.error("song：送电子币异常  ", e);
+        }
+
+        return 0;
+    }
+
 }
 

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

@@ -71,4 +71,6 @@ public class AssetsController {
         }
         return new Result(false, "上传失败");
     }
+
+
 }

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

@@ -0,0 +1,165 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.ImageUploadLog;
+import com.izouma.awesomeadmin.service.ImageUploadLogService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/imageUploadLog")
+public class ImageUploadLogController {
+
+    @Autowired
+    private ImageUploadLogService imageUploadLogService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(ImageUploadLog record) {
+        List<ImageUploadLog> pp = imageUploadLogService.getImageUploadLogList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getImageUploadLog", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getImageUploadLog(@RequestParam(required = false, value = "id") String id) {
+        ImageUploadLog data = imageUploadLogService.getImageUploadLogById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(ImageUploadLog record) {
+        ImageUploadLog data = imageUploadLogService.getImageUploadLog(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, ImageUploadLog record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<ImageUploadLog> pp =imageUploadLogService.getImageUploadLogByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(ImageUploadLog record) {
+        boolean num = imageUploadLogService.createImageUploadLog(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateImageUploadLog(ImageUploadLog record) {
+        boolean num = imageUploadLogService.updateImageUploadLog(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteImageUploadLog(@RequestParam(required = true, value = "id") String id) {
+
+        boolean num = imageUploadLogService.deleteImageUploadLog(id);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, ImageUploadLog record) throws Exception {
+
+    List<ImageUploadLog> imageUploadLogs = imageUploadLogService.getImageUploadLogList(record);
+
+
+        String sheetName = "image_upload_log";
+        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 = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "地址" ,   "店铺" ,   "订单" ,   "用户" ,   "类型" ,   "大小" ,   "使用"  };
+        String[][] dataList = new String[imageUploadLogs.size()][14];
+
+        for (int i = 0; i < imageUploadLogs.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(imageUploadLogs.get(i).getId());
+                        dataList[i][1] = String.valueOf(imageUploadLogs.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(imageUploadLogs.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(imageUploadLogs.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(imageUploadLogs.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(imageUploadLogs.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(imageUploadLogs.get(i).getImageName());
+                        dataList[i][7] = String.valueOf(imageUploadLogs.get(i).getUrl());
+                        dataList[i][8] = String.valueOf(imageUploadLogs.get(i).getStoreId());
+                        dataList[i][9] = String.valueOf(imageUploadLogs.get(i).getOrderId());
+                        dataList[i][10] = String.valueOf(imageUploadLogs.get(i).getUserId());
+                        dataList[i][11] = String.valueOf(imageUploadLogs.get(i).getTypeFlag());
+                        dataList[i][12] = String.valueOf(imageUploadLogs.get(i).getImageSize());
+                        dataList[i][13] = String.valueOf(imageUploadLogs.get(i).getUseFlag());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/memberCoin")
 public class MemberCoinController {
@@ -28,8 +28,8 @@ public class MemberCoinController {
     private MemberCoinService memberCoinService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class MemberCoinController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getMemberCoin", method = RequestMethod.GET)
     @ResponseBody
     public Result getMemberCoin(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class MemberCoinController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(MemberCoin record) {
@@ -60,14 +60,14 @@ public class MemberCoinController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, MemberCoin record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<MemberCoin> pp =memberCoinService.getMemberCoinByPage(page, record);
+        List<MemberCoin> pp = memberCoinService.getMemberCoinByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,88 +76,102 @@ public class MemberCoinController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(MemberCoin record) {
         boolean num = memberCoinService.createMemberCoin(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMemberCoin(MemberCoin record) {
         boolean num = memberCoinService.updateMemberCoin(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteMemberCoin(@RequestParam(required = true, value = "id") String id) {
 
         boolean num = memberCoinService.deleteMemberCoin(id);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, MemberCoin record) throws Exception {
 
-    List<MemberCoin> memberCoins = memberCoinService.getMemberCoinList(record);
+        List<MemberCoin> memberCoins = memberCoinService.getMemberCoinList(record);
 
 
         String sheetName = "member_coin";
         String titleName = "用户余额数据表";
         String fileName = "用户余额表";
         int columnNumber = 12;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "订单" ,   "变动金额" ,   "剩余金额" ,   "类型" ,   "备注"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "用户", "订单", "变动金额", "剩余金额", "类型", "备注"};
         String[][] dataList = new String[memberCoins.size()][12];
 
         for (int i = 0; i < memberCoins.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(memberCoins.get(i).getId());
-                        dataList[i][1] = String.valueOf(memberCoins.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(memberCoins.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(memberCoins.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(memberCoins.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(memberCoins.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(memberCoins.get(i).getUserId());
-                        dataList[i][7] = String.valueOf(memberCoins.get(i).getOrderId());
-                        dataList[i][8] = String.valueOf(memberCoins.get(i).getMoney());
-                        dataList[i][9] = String.valueOf(memberCoins.get(i).getBalance());
-                        dataList[i][10] = String.valueOf(memberCoins.get(i).getTypeFlag());
-                        dataList[i][11] = String.valueOf(memberCoins.get(i).getRemark());
-                    }
+            dataList[i][0] = String.valueOf(memberCoins.get(i).getId());
+            dataList[i][1] = String.valueOf(memberCoins.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(memberCoins.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(memberCoins.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(memberCoins.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(memberCoins.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(memberCoins.get(i).getUserId());
+            dataList[i][7] = String.valueOf(memberCoins.get(i).getOrderId());
+            dataList[i][8] = String.valueOf(memberCoins.get(i).getMoney());
+            dataList[i][9] = String.valueOf(memberCoins.get(i).getBalance());
+            dataList[i][10] = String.valueOf(memberCoins.get(i).getTypeFlag());
+            dataList[i][11] = String.valueOf(memberCoins.get(i).getRemark());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
+
 
+    }
 
+    @RequestMapping(value = "/song", method = RequestMethod.POST)
+    @ResponseBody
+    public Result song(MemberCoin memberCoin) {
+
+        int num = memberCoinService.song(memberCoin);
+        if (num > 0) {
+            return new Result(true, "赠送成功");
         }
+        return new Result(false, "赠送异常");
+
     }
 
+}
+

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

@@ -1,25 +1,34 @@
 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.ImageUploadLog;
 import com.izouma.awesomeadmin.model.OrderImage;
+import com.izouma.awesomeadmin.service.ImageUploadLogService;
+import com.izouma.awesomeadmin.service.OSSFileService;
 import com.izouma.awesomeadmin.service.OrderImageService;
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/orderImage")
 public class OrderImageController {
@@ -27,9 +36,15 @@ public class OrderImageController {
     @Autowired
     private OrderImageService orderImageService;
 
+    @Autowired
+    private OSSFileService OSSFileService;
+
+    @Autowired
+    private ImageUploadLogService imageUploadLogService;
+
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +54,8 @@ public class OrderImageController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getOrderImage", method = RequestMethod.GET)
     @ResponseBody
     public Result getOrderImage(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +64,8 @@ public class OrderImageController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(OrderImage record) {
@@ -60,14 +75,14 @@ public class OrderImageController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, OrderImage record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<OrderImage> pp =orderImageService.getOrderImageByPage(page, record);
+        List<OrderImage> pp = orderImageService.getOrderImageByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,93 +91,96 @@ public class OrderImageController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(OrderImage record) {
+
         boolean num = orderImageService.createOrderImage(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateOrderImage(OrderImage record) {
+
         boolean num = orderImageService.updateOrderImage(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteOrderImage(@RequestParam(required = true, value = "id") String id) {
 
         boolean num = orderImageService.deleteOrderImage(id);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, OrderImage record) throws Exception {
 
-    List<OrderImage> orderImages = orderImageService.getOrderImageList(record);
+        List<OrderImage> orderImages = orderImageService.getOrderImageList(record);
 
 
         String sheetName = "order_image";
         String titleName = "订单图片数据表";
         String fileName = "订单图片表";
         int columnNumber = 16;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "订单" ,   "用户" ,   "店铺" ,   "原片地址" ,   "原片大小" ,   "成片地址" ,   "成片大小" ,   "修图人" ,   "状态" ,   "备注"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "订单", "用户", "店铺", "原片地址", "原片大小", "成片地址", "成片大小", "修图人", "状态", "备注"};
         String[][] dataList = new String[orderImages.size()][16];
 
         for (int i = 0; i < orderImages.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(orderImages.get(i).getId());
-                        dataList[i][1] = String.valueOf(orderImages.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(orderImages.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(orderImages.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(orderImages.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(orderImages.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(orderImages.get(i).getOrderId());
-                        dataList[i][7] = String.valueOf(orderImages.get(i).getUserId());
-                        dataList[i][8] = String.valueOf(orderImages.get(i).getStoreId());
-                        dataList[i][9] = String.valueOf(orderImages.get(i).getOriginalImage());
-                        dataList[i][10] = String.valueOf(orderImages.get(i).getOriginalSize());
-                        dataList[i][11] = String.valueOf(orderImages.get(i).getFinishedImage());
-                        dataList[i][12] = String.valueOf(orderImages.get(i).getFinishedSize());
-                        dataList[i][13] = String.valueOf(orderImages.get(i).getDealUser());
-                        dataList[i][14] = String.valueOf(orderImages.get(i).getStatusFlag());
-                        dataList[i][15] = String.valueOf(orderImages.get(i).getRemark());
-                    }
+            dataList[i][0] = String.valueOf(orderImages.get(i).getId());
+            dataList[i][1] = String.valueOf(orderImages.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(orderImages.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(orderImages.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(orderImages.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(orderImages.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(orderImages.get(i).getOrderId());
+            dataList[i][7] = String.valueOf(orderImages.get(i).getUserId());
+            dataList[i][8] = String.valueOf(orderImages.get(i).getStoreId());
+            dataList[i][9] = String.valueOf(orderImages.get(i).getOriginalImage());
+            dataList[i][10] = String.valueOf(orderImages.get(i).getOriginalSize());
+            dataList[i][11] = String.valueOf(orderImages.get(i).getFinishedImage());
+            dataList[i][12] = String.valueOf(orderImages.get(i).getFinishedSize());
+            dataList[i][13] = String.valueOf(orderImages.get(i).getDealUser());
+            dataList[i][14] = String.valueOf(orderImages.get(i).getStatusFlag());
+            dataList[i][15] = String.valueOf(orderImages.get(i).getRemark());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
+    }
 
 
     /**
@@ -177,5 +195,47 @@ public class OrderImageController {
         }
         return new Result(false, "保存异常");
     }
+
+    @RequestMapping(value = "/uploadFileForOrder")
+    @ResponseBody
+    public Result uploadFile(HttpServletRequest request, String storeId, String orderId, String userId, String typeFlag) {
+        CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession().getServletContext());
+        if (multipartResolver.isMultipart(request)) {
+            MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+            Iterator it = multiRequest.getFileNames();
+            List<ImageUploadLog> paths = new ArrayList<>();
+            while (it.hasNext()) {
+                MultipartFile file = multiRequest.getFile(it.next().toString());
+                if (file != null) {
+                    try {
+                        String originalFilename = file.getOriginalFilename();
+
+                        String uploadPath = storeId + "/" + orderId + "/" + typeFlag + "/" + originalFilename;
+
+
+                        String path = OSSFileService.upload(file.getInputStream(), uploadPath);
+
+                        ImageUploadLog imageUploadLog = new ImageUploadLog();
+
+                        imageUploadLog.setStoreId(storeId);
+                        imageUploadLog.setOrderId(orderId);
+                        imageUploadLog.setTypeFlag(typeFlag);
+                        imageUploadLog.setUserId(userId);
+                        imageUploadLog.setImageName(originalFilename);
+                        imageUploadLog.setUrl(path);
+                        imageUploadLog.setImageSize(BigDecimal.valueOf(file.getSize()));
+                        imageUploadLogService.createImageUploadLog(imageUploadLog);
+
+                        paths.add(imageUploadLog);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return new Result(false, "上传失败");
+                    }
+                }
+            }
+            return new Result(true, paths);
+        }
+        return new Result(false, "上传失败");
     }
+}
 

src/main/vue/src/pages/ImageUploadLog.vue

@@ -0,0 +1,126 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="imageName" label="名称">
+                <el-input v-model="formData.imageName" :disabled="'imageName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="url" label="地址">
+                <el-input v-model="formData.url" :disabled="'url'==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="orderId" label="订单">
+                <el-input v-model="formData.orderId" :disabled="'orderId'==subColumn"></el-input>
+            </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="typeFlag" label="类型">
+                <el-input v-model="formData.typeFlag" :disabled="'typeFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="imageSize" label="大小">
+                <el-input v-model="formData.imageSize" :disabled="'imageSize'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="useFlag" label="使用">
+                <el-input v-model="formData.useFlag" :disabled="'useFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/imageUploadLog/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                            },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                            subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/imageUploadLog/update' : '/imageUploadLog/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: '/imageUploadLog/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/ImageUploadLogs.vue

@@ -0,0 +1,519 @@
+<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:'/imageUploadLog',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('imageName')"
+                                prop="imageName"
+                                label="名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('url')"
+                                prop="url"
+                                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('orderId')"
+                                prop="orderId"
+                                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('typeFlag')"
+                                prop="typeFlag"
+                                label="类型"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('imageSize')"
+                                prop="imageSize"
+                                label="大小"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('useFlag')"
+                                prop="useFlag"
+                                label="使用"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '名称',
+                                value: 'imageName',
+                                show: true
+                            },
+                                                                                                {
+                                label: '地址',
+                                value: 'url',
+                                show: true
+                            },
+                                                                                                {
+                                label: '店铺',
+                                value: 'storeId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '订单',
+                                value: 'orderId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '用户',
+                                value: 'userId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '类型',
+                                value: 'typeFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '大小',
+                                value: 'imageSize',
+                                show: true
+                            },
+                                                                                                {
+                                label: '使用',
+                                value: 'useFlag',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '名称',
+                                value: 'image_name'
+                            },
+                                                                                                {
+                                label: '地址',
+                                value: 'url'
+                            },
+                                                                                                {
+                                label: '店铺',
+                                value: 'store_id'
+                            },
+                                                                                                {
+                                label: '订单',
+                                value: 'order_id'
+                            },
+                                                                                                {
+                                label: '用户',
+                                value: 'user_id'
+                            },
+                                                                                                {
+                                label: '类型',
+                                value: 'type_flag'
+                            },
+                                                                                                {
+                                label: '大小',
+                                value: 'image_size'
+                            },
+                                                                                                {
+                                label: '使用',
+                                value: 'use_flag'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/imageUploadLog/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: '/imageUploadLog',
+                    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 + "/imageUploadLog/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: '/imageUploadLog/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/MemberCoinSong.vue

@@ -0,0 +1,72 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="userId" label="用户">
+                <el-select v-model="formData.userId" filterable placeholder="请选择" size="small">
+                    <el-option v-for="item in userInfos" :key="item.id" :label="item.nickname" :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="money" label="变动金额">
+                <el-input v-model="formData.money"></el-input>
+            </el-form-item>
+            <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+
+        this.$http.get({
+            url: '/userInfo/all'
+        }).then(res => {
+            if (res.success) {
+                this.userInfos = res.data;
+            }
+        });
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+            },
+            subColumn: '',
+            subValue: '',
+            userInfos: [],
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: '/memberCoin/song',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/MemberCoins.vue

@@ -17,6 +17,10 @@
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
+            <el-button @click="$router.push({path:'/memberCoinSong',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">赠送
+            </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
                   筛选数据<i class="el-icon-arrow-down el-icon--right"></i>

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

@@ -405,6 +405,11 @@ const router = new Router({
                     name: 'MemberCoins',
                     component: () => import('../pages/MemberCoins')
                 },
+                {
+                    path: '/memberCoinSong',
+                    name: 'MemberCoinSong',
+                    component: () => import('../pages/MemberCoinSong')
+                },
                 {
                     path: '/memberCoinTixian',
                     name: 'MemberCoinTixian',
@@ -594,6 +599,16 @@ const router = new Router({
                     path: '/logisticsInfos',
                     name: 'LogisticsInfos',
                     component: () => import('../pages/LogisticsInfos')
+                },
+                {
+                    path: '/imageUploadLog',
+                    name: 'ImageUploadLog',
+                    component: () => import('../pages/ImageUploadLog')
+                },
+                {
+                    path: '/imageUploadLogs',
+                    name: 'ImageUploadLogs',
+                    component: () => import('../pages/ImageUploadLogs')
                 }
                 /**INSERT_LOCATION**/
             ]

src/test/java/OrderServiceTest.java

@@ -1,3 +1,4 @@
+import com.izouma.awesomeadmin.service.OSSFileService;
 import com.izouma.awesomeadmin.service.UserInfoService;
 import com.izouma.awesomeadmin.util.MbappUtil;
 import org.junit.Test;
@@ -15,15 +16,23 @@ import java.util.UUID;
 @Transactional
 public class OrderServiceTest {
 
+    @Autowired
+    private OSSFileService oSSFileService;
+
     @Test
     public void testGenOrderID() {
         String machineId = "1";
-        String OrderId =machineId +(System.currentTimeMillis() + "").substring(1) +(System.nanoTime() + "").substring(7, 10);
+        String OrderId = machineId + (System.currentTimeMillis() + "").substring(1) + (System.nanoTime() + "").substring(7, 10);
 
         System.out.println(OrderId);
 
-        OrderId =MbappUtil.getOrderIdByUUId();
+        OrderId = MbappUtil.getOrderIdByUUId();
         System.out.println(OrderId);
     }
 
+    @Test
+    public void testDeleteImage() {
+        oSSFileService.deleteObject("http://oss.izouma.com/tutuxiang/null/null/null/2.jpg");
+    }
+
 }