Browse Source

初始化

suochencheng 7 years ago
parent
commit
6d8274095e
100 changed files with 0 additions and 24612 deletions
  1. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/AboutUsMapper.java
  2. 0 371
      src/main/java/com/izouma/awesomeadmin/dao/AboutUsMapper.xml
  3. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.java
  4. 0 440
      src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.xml
  5. 0 44
      src/main/java/com/izouma/awesomeadmin/dao/ChatInfoMapper.java
  6. 0 267
      src/main/java/com/izouma/awesomeadmin/dao/ChatInfoMapper.xml
  7. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/CompanyAuthenticationMapper.java
  8. 0 594
      src/main/java/com/izouma/awesomeadmin/dao/CompanyAuthenticationMapper.xml
  9. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/CompanyTypeMapper.java
  10. 0 388
      src/main/java/com/izouma/awesomeadmin/dao/CompanyTypeMapper.xml
  11. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ContactUsMapper.java
  12. 0 441
      src/main/java/com/izouma/awesomeadmin/dao/ContactUsMapper.xml
  13. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/CouponInfoMapper.java
  14. 0 463
      src/main/java/com/izouma/awesomeadmin/dao/CouponInfoMapper.xml
  15. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/CreditRatingMapper.java
  16. 0 390
      src/main/java/com/izouma/awesomeadmin/dao/CreditRatingMapper.xml
  17. 0 36
      src/main/java/com/izouma/awesomeadmin/dao/CustomerServiceMapper.java
  18. 0 532
      src/main/java/com/izouma/awesomeadmin/dao/CustomerServiceMapper.xml
  19. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/DistrictInfoMapper.java
  20. 0 394
      src/main/java/com/izouma/awesomeadmin/dao/DistrictInfoMapper.xml
  21. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/FeedbackMapper.java
  22. 0 417
      src/main/java/com/izouma/awesomeadmin/dao/FeedbackMapper.xml
  23. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/HelpTextMapper.java
  24. 0 394
      src/main/java/com/izouma/awesomeadmin/dao/HelpTextMapper.xml
  25. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ImageDownLogMapper.java
  26. 0 519
      src/main/java/com/izouma/awesomeadmin/dao/ImageDownLogMapper.xml
  27. 0 35
      src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.java
  28. 0 585
      src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.xml
  29. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/JoinUsMapper.java
  30. 0 394
      src/main/java/com/izouma/awesomeadmin/dao/JoinUsMapper.xml
  31. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/LogisticsInfoMapper.java
  32. 0 245
      src/main/java/com/izouma/awesomeadmin/dao/LogisticsInfoMapper.xml
  33. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/MemberCoinMapper.java
  34. 0 440
      src/main/java/com/izouma/awesomeadmin/dao/MemberCoinMapper.xml
  35. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/MemberCoinTixianMapper.java
  36. 0 619
      src/main/java/com/izouma/awesomeadmin/dao/MemberCoinTixianMapper.xml
  37. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/MemberPointMapper.java
  38. 0 450
      src/main/java/com/izouma/awesomeadmin/dao/MemberPointMapper.xml
  39. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/OrderAddressMapper.java
  40. 0 486
      src/main/java/com/izouma/awesomeadmin/dao/OrderAddressMapper.xml
  41. 0 39
      src/main/java/com/izouma/awesomeadmin/dao/OrderImageMapper.java
  42. 0 848
      src/main/java/com/izouma/awesomeadmin/dao/OrderImageMapper.xml
  43. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/OrderInvoiceMapper.java
  44. 0 461
      src/main/java/com/izouma/awesomeadmin/dao/OrderInvoiceMapper.xml
  45. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/OrderLogisticsMapper.java
  46. 0 459
      src/main/java/com/izouma/awesomeadmin/dao/OrderLogisticsMapper.xml
  47. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/OrderMessageMapper.java
  48. 0 440
      src/main/java/com/izouma/awesomeadmin/dao/OrderMessageMapper.xml
  49. 0 35
      src/main/java/com/izouma/awesomeadmin/dao/OrderRepairDetailMapper.java
  50. 0 395
      src/main/java/com/izouma/awesomeadmin/dao/OrderRepairDetailMapper.xml
  51. 0 36
      src/main/java/com/izouma/awesomeadmin/dao/OrderRepairMapper.java
  52. 0 465
      src/main/java/com/izouma/awesomeadmin/dao/OrderRepairMapper.xml
  53. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/PersonalAuthenticationMapper.java
  54. 0 505
      src/main/java/com/izouma/awesomeadmin/dao/PersonalAuthenticationMapper.xml
  55. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ProductCollectionMapper.java
  56. 0 394
      src/main/java/com/izouma/awesomeadmin/dao/ProductCollectionMapper.xml
  57. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ProductCommentImageMapper.java
  58. 0 463
      src/main/java/com/izouma/awesomeadmin/dao/ProductCommentImageMapper.xml
  59. 0 36
      src/main/java/com/izouma/awesomeadmin/dao/ProductCommentMapper.java
  60. 0 580
      src/main/java/com/izouma/awesomeadmin/dao/ProductCommentMapper.xml
  61. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ProductImageMapper.java
  62. 0 415
      src/main/java/com/izouma/awesomeadmin/dao/ProductImageMapper.xml
  63. 0 34
      src/main/java/com/izouma/awesomeadmin/dao/ProductInfoMapper.java
  64. 0 687
      src/main/java/com/izouma/awesomeadmin/dao/ProductInfoMapper.xml
  65. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ProductPriceMapper.java
  66. 0 506
      src/main/java/com/izouma/awesomeadmin/dao/ProductPriceMapper.xml
  67. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/QuickLinksMapper.java
  68. 0 417
      src/main/java/com/izouma/awesomeadmin/dao/QuickLinksMapper.xml
  69. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeDetailMapper.java
  70. 0 394
      src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeDetailMapper.xml
  71. 0 36
      src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeMapper.java
  72. 0 620
      src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeMapper.xml
  73. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/ShopAgreementMapper.java
  74. 0 348
      src/main/java/com/izouma/awesomeadmin/dao/ShopAgreementMapper.xml
  75. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/StoreCollectionMapper.java
  76. 0 382
      src/main/java/com/izouma/awesomeadmin/dao/StoreCollectionMapper.xml
  77. 0 37
      src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.java
  78. 0 955
      src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.xml
  79. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/StoreLabelMapper.java
  80. 0 348
      src/main/java/com/izouma/awesomeadmin/dao/StoreLabelMapper.xml
  81. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/SystemConfigMapper.java
  82. 0 459
      src/main/java/com/izouma/awesomeadmin/dao/SystemConfigMapper.xml
  83. 0 35
      src/main/java/com/izouma/awesomeadmin/dao/UserAddressMapper.java
  84. 0 486
      src/main/java/com/izouma/awesomeadmin/dao/UserAddressMapper.xml
  85. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/UserAgreementMapper.java
  86. 0 367
      src/main/java/com/izouma/awesomeadmin/dao/UserAgreementMapper.xml
  87. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/UserCouponMapper.java
  88. 0 394
      src/main/java/com/izouma/awesomeadmin/dao/UserCouponMapper.xml
  89. 0 2
      src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml
  90. 0 36
      src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.java
  91. 0 868
      src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml
  92. 0 49
      src/main/java/com/izouma/awesomeadmin/dao/UsersSessionMapper.java
  93. 0 403
      src/main/java/com/izouma/awesomeadmin/dao/UsersSessionMapper.xml
  94. 0 122
      src/main/java/com/izouma/awesomeadmin/model/AboutUs.java
  95. 0 146
      src/main/java/com/izouma/awesomeadmin/model/BannerInfo.java
  96. 0 220
      src/main/java/com/izouma/awesomeadmin/model/ChatInfo.java
  97. 0 202
      src/main/java/com/izouma/awesomeadmin/model/CompanyAuthentication.java
  98. 0 132
      src/main/java/com/izouma/awesomeadmin/model/CompanyType.java
  99. 0 169
      src/main/java/com/izouma/awesomeadmin/model/ContactUs.java
  100. 0 154
      src/main/java/com/izouma/awesomeadmin/model/CouponInfo.java

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/AboutUsMapper.java

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

+ 0 - 371
src/main/java/com/izouma/awesomeadmin/dao/AboutUsMapper.xml

@@ -1,371 +0,0 @@
-<?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.AboutUsMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.AboutUs" >
-                <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="title" property="title" jdbcType="VARCHAR" />
-                                <result column="description" property="description" jdbcType="VARCHAR" />
-                                <result column="image" property="image" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            title,
-
-            description,
-
-            image,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from about_us
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from about_us
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.AboutUs" useGeneratedKeys="true" keyProperty="id">
-        insert into about_us
-        <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="title!= null" >
-                title,
-            </if>
-                <if test="description!= null" >
-                description,
-            </if>
-                <if test="image!= null" >
-                image,
-            </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="title != null" >
-                #{title,jdbcType=VARCHAR},
-            </if>
-                    <if test="description != null" >
-                #{description,jdbcType=VARCHAR},
-            </if>
-                    <if test="image != null" >
-                #{image,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.AboutUs" >
-        update about_us
-        <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="title != null" >
-               title= #{title,jdbcType=VARCHAR},
-            </if>
-                     <if test="description != null" >
-               description= #{description,jdbcType=VARCHAR},
-            </if>
-                     <if test="image != null" >
-               image= #{image,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryAboutUsByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AboutUs">
-        select <include refid="Base_Column_List"/> from about_us
-        <where>
-            and del_flag = 'N'
-                    <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.title != null and !&quot;&quot;.equals(record.title)">
-                and  title = #{record.title}
-            </if>
-                     <if test="record.description != null and !&quot;&quot;.equals(record.description)">
-                and  description = #{record.description}
-            </if>
-                     <if test="record.image != null and !&quot;&quot;.equals(record.image)">
-                and  image = #{record.image}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  title LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  description LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image 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="queryAllAboutUs" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AboutUs">
-        select <include refid="Base_Column_List"/> from about_us
-        <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="title != null and !&quot;&quot;.equals(title)">
-                and  title = #{title}
-            </if>
-                    <if test="description != null and !&quot;&quot;.equals(description)">
-                and  description = #{description}
-            </if>
-                    <if test="image != null and !&quot;&quot;.equals(image)">
-                and  image = #{image}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  title LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  description LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image 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="queryAboutUs" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AboutUs">
-        select <include refid="Base_Column_List"/> from about_us
-        <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="title != null and !&quot;&quot;.equals(title)">
-                and title = #{title}
-            </if>
-                     <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-                     <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE about_us SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AboutUs">
-        select <include refid="Base_Column_List"/> from about_us
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.java

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

+ 0 - 440
src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.xml

@@ -1,440 +0,0 @@
-<?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.BannerInfoMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.BannerInfo" >
-                <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="location" property="location" jdbcType="VARCHAR" />
-                                <result column="title" property="title" jdbcType="VARCHAR" />
-                                <result column="subtitle" property="subtitle" jdbcType="VARCHAR" />
-                                <result column="url" property="url" jdbcType="VARCHAR" />
-                                <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            location,
-
-            title,
-
-            subtitle,
-
-            url,
-
-            image_url,
-
-            rank,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from banner_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from banner_info
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.BannerInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into banner_info
-        <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="location!= null" >
-                location,
-            </if>
-                <if test="title!= null" >
-                title,
-            </if>
-                <if test="subtitle!= null" >
-                subtitle,
-            </if>
-                <if test="url!= null" >
-                url,
-            </if>
-                <if test="imageUrl!= null" >
-                image_url,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </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="location != null" >
-                #{location,jdbcType=VARCHAR},
-            </if>
-                    <if test="title != null" >
-                #{title,jdbcType=VARCHAR},
-            </if>
-                    <if test="subtitle != null" >
-                #{subtitle,jdbcType=VARCHAR},
-            </if>
-                    <if test="url != null" >
-                #{url,jdbcType=VARCHAR},
-            </if>
-                    <if test="imageUrl != null" >
-                #{imageUrl,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.BannerInfo" >
-        update banner_info
-        <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="location != null" >
-               location= #{location,jdbcType=VARCHAR},
-            </if>
-                     <if test="title != null" >
-               title= #{title,jdbcType=VARCHAR},
-            </if>
-                     <if test="subtitle != null" >
-               subtitle= #{subtitle,jdbcType=VARCHAR},
-            </if>
-                     <if test="url != null" >
-               url= #{url,jdbcType=VARCHAR},
-            </if>
-                     <if test="imageUrl != null" >
-               image_url= #{imageUrl,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryBannerInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
-        select <include refid="Base_Column_List"/> from banner_info
-        <where>
-            and del_flag = 'N'
-                    <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.location != null and !&quot;&quot;.equals(record.location)">
-                and  location = #{record.location}
-            </if>
-                     <if test="record.title != null and !&quot;&quot;.equals(record.title)">
-                and  title = #{record.title}
-            </if>
-                     <if test="record.subtitle != null and !&quot;&quot;.equals(record.subtitle)">
-                and  subtitle = #{record.subtitle}
-            </if>
-                     <if test="record.url != null and !&quot;&quot;.equals(record.url)">
-                and  url = #{record.url}
-            </if>
-                     <if test="record.imageUrl != null and !&quot;&quot;.equals(record.imageUrl)">
-                and  image_url = #{record.imageUrl}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  location LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  title LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  subtitle LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image_url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank 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>
-        location , rank desc, id desc
-    </select>
-    <select id="queryAllBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
-        select <include refid="Base_Column_List"/> from banner_info
-        <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="location != null and !&quot;&quot;.equals(location)">
-                and  location = #{location}
-            </if>
-                    <if test="title != null and !&quot;&quot;.equals(title)">
-                and  title = #{title}
-            </if>
-                    <if test="subtitle != null and !&quot;&quot;.equals(subtitle)">
-                and  subtitle = #{subtitle}
-            </if>
-                    <if test="url != null and !&quot;&quot;.equals(url)">
-                and  url = #{url}
-            </if>
-                    <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and  image_url = #{imageUrl}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  location LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  title LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  subtitle LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image_url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank 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>
-
-        location , rank desc, id desc
-    </select>
-    <select id="queryBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
-        select <include refid="Base_Column_List"/> from banner_info
-        <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="location != null and !&quot;&quot;.equals(location)">
-                and location = #{location}
-            </if>
-                     <if test="title != null and !&quot;&quot;.equals(title)">
-                and title = #{title}
-            </if>
-                     <if test="subtitle != null and !&quot;&quot;.equals(subtitle)">
-                and subtitle = #{subtitle}
-            </if>
-                     <if test="url != null and !&quot;&quot;.equals(url)">
-                and url = #{url}
-            </if>
-                     <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and image_url = #{imageUrl}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE banner_info SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
-        select <include refid="Base_Column_List"/> from banner_info
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 44
src/main/java/com/izouma/awesomeadmin/dao/ChatInfoMapper.java

@@ -1,44 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import com.izouma.awesomeadmin.model.ChatInfo;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Repository("com.izouma.awesomeadmin.dao.ChatInfoMapper")
-public interface ChatInfoMapper {
-
-    int deleteByPrimaryKey(Integer id);
-
-
-    int insert(ChatInfo record);
-
-
-    int insertSelective(ChatInfo record);
-
-
-    ChatInfo selectByPrimaryKey(Integer id);
-
-
-    int updateByPrimaryKeySelective(ChatInfo record);
-
-
-    int updateByPrimaryKey(ChatInfo record);
-
-
-    List<ChatInfo> queryAllChatInfo();
-
-
-    List<ChatInfo> queryChatInfosByPage(Map<String, Object> parameter);
-
-
-    int delete(String id);
-
-
-    ChatInfo queryChatInfo(ChatInfo chatInfo);
-
-    int readAll(ChatInfo chatInfo);
-    
-    ChatInfo queryLastChatInfo(ChatInfo chatInfo);
-}

+ 0 - 267
src/main/java/com/izouma/awesomeadmin/dao/ChatInfoMapper.xml

@@ -1,267 +0,0 @@
-<?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.ChatInfoMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ChatInfo">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="to_user_id" property="toUserId" jdbcType="INTEGER"/>
-        <result column="content" property="content" jdbcType="VARCHAR"/>
-        <result column="time" property="time" jdbcType="TIMESTAMP"/>
-        <result column="content_type" property="contentType" jdbcType="INTEGER"/>
-        <result column="state" property="state" jdbcType="INTEGER"/>
-        <result column="project_id" property="projectId" jdbcType="INTEGER"/>
-        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
-        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-        <result column="service_name" property="serviceName" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        id, user_id, to_user_id, content, time, content_type, state, project_id, store_id, type_flag, service_name
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from chat_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        DELETE FROM chat_info
-        WHERE id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insert" parameterType="com.izouma.awesomeadmin.model.ChatInfo" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO chat_info (id, user_id, to_user_id,
-                               content, time, content_type,
-                               state,project_id, store_id,type_flag)
-        VALUES (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{toUserId,jdbcType=INTEGER},
-                #{content,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, #{contentType,jdbcType=INTEGER},
-                #{state,jdbcType=INTEGER},#{projectId,jdbcType=INTEGER},#{storeId,jdbcType=INTEGER},#{typeFlag,jdbcType=INTEGER})
-    </insert>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ChatInfo" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into chat_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="userId != null">
-                user_id,
-            </if>
-            <if test="toUserId != null">
-                to_user_id,
-            </if>
-            <if test="content != null">
-                content,
-            </if>
-            <if test="time != null">
-                time,
-            </if>
-            <if test="contentType != null">
-                content_type,
-            </if>
-            <if test="state != null">
-                state,
-            </if>
-            <if test="projectId != null">
-                project_id,
-            </if>
-            <if test="storeId != null">
-                store_id,
-            </if>
-            <if test="typeFlag != null">
-                type_flag,
-            </if>
-            <if test="serviceName != null">
-                service_name,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="toUserId != null">
-                #{toUserId,jdbcType=INTEGER},
-            </if>
-            <if test="content != null">
-                #{content,jdbcType=VARCHAR},
-            </if>
-            <if test="time != null">
-                #{time,jdbcType=TIMESTAMP},
-            </if>
-            <if test="contentType != null">
-                #{contentType,jdbcType=INTEGER},
-            </if>
-            <if test="state != null">
-                #{state,jdbcType=INTEGER},
-            </if>
-            <if test="projectId != null">
-                #{projectId,jdbcType=INTEGER},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=INTEGER},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="serviceName != null">
-                #{serviceName,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ChatInfo">
-        update chat_info
-        <set>
-            <if test="userId != null">
-                user_id = #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="toUserId != null">
-                to_user_id = #{toUserId,jdbcType=INTEGER},
-            </if>
-            <if test="content != null">
-                content = #{content,jdbcType=VARCHAR},
-            </if>
-            <if test="time != null">
-                time = #{time,jdbcType=TIMESTAMP},
-            </if>
-            <if test="contentType != null">
-                content_type = #{contentType,jdbcType=INTEGER},
-            </if>
-            <if test="state != null">
-                state = #{state,jdbcType=INTEGER},
-            </if>
-            <if test="projectId != null">
-                project_id = #{projectId,jdbcType=INTEGER},
-            </if>
-            <if test="storeId != null">
-                store_id = #{storeId,jdbcType=INTEGER},
-            </if>
-            <if test="typeFlag != null">
-                type_flag = #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="serviceName != null">
-                service_name = #{serviceName,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="com.izouma.awesomeadmin.model.ChatInfo">
-        UPDATE chat_info
-        SET user_id      = #{userId,jdbcType=INTEGER},
-            to_user_id   = #{toUserId,jdbcType=INTEGER},
-            content      = #{content,jdbcType=VARCHAR},
-            time         = #{time,jdbcType=TIMESTAMP},
-            content_type = #{contentType,jdbcType=INTEGER},
-            state        = #{state,jdbcType=INTEGER},
-            project_id        = #{projectId,jdbcType=INTEGER}
-            store_id        = #{storeId,jdbcType=INTEGER}
-        WHERE id = #{id,jdbcType=INTEGER}
-    </update>
-
-
-    <select id="queryChatInfosByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ChatInfo">
-        SELECT
-        chat_info.*, uInfo.nickname as nick_name,
-        uInfo.icon,
-        serviceInfo.icon as service_icon,
-        serviceInfo.service_name as  service_nick
-        FROM
-        chat_info
-        LEFT JOIN sys_user uInfo ON chat_info.user_id = uInfo.id
-        LEFT JOIN customer_service serviceInfo ON chat_info.service_name = serviceInfo.username
-        <where>
-            and state != 2
-
-            <if test="chatInfo.id != null and !&quot;&quot;.equals(chatInfo.id)">
-                and chat_info.id=#{chatInfo.id}
-            </if>
-            <if test="chatInfo.userId != null and !&quot;&quot;.equals(chatInfo.userId)">
-                and chat_info.user_id=#{chatInfo.userId}
-
-            </if>
-            <if test="chatInfo.contentType != null and !&quot;&quot;.equals(chatInfo.contentType)">
-                and content_type=#{chatInfo.contentType}
-            </if>
-            <if test="chatInfo.projectId != null and !&quot;&quot;.equals(chatInfo.projectId)">
-                and chat_info.project_id=#{chatInfo.projectId}
-            </if>
-            <if test="chatInfo.storeId != null and !&quot;&quot;.equals(chatInfo.storeId)">
-                and chat_info.store_id=#{chatInfo.storeId}
-            </if>
-            <if test="chatInfo.typeFlag != null and !&quot;&quot;.equals(chatInfo.typeFlag)">
-                and chat_info.type_flag=#{chatInfo.typeFlag}
-            </if>
-            <if test="chatInfo.serviceName != null and !&quot;&quot;.equals(chatInfo.serviceName)">
-                and chat_info.service_name=#{chatInfo.serviceName}
-            </if>
-        </where>
-        order by time desc
-    </select>
-
-    <select id="queryLastChatInfo" parameterType="com.izouma.awesomeadmin.model.ChatInfo"
-            resultType="com.izouma.awesomeadmin.model.ChatInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from chat_info
-        <where>
-            user_id = #{userId} and service_name = #{serviceName} and store_id=#{storeId}
-        </where>
-        order by time desc
-        limit 1
-    </select>
-
-    <select id="queryAllChatInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ChatInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from chat_info
-        <where>
-            and state != 2
-        </where>
-        order by time desc
-    </select>
-
-    <select id="queryChatInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ChatInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from chat_info
-        <where>
-            and state != 2
-
-            <if test="chatInfo.id != null and !&quot;&quot;.equals(chatInfo.id)">
-                and id=#{chatInfo.id}
-            </if>
-            <if test="chatInfo.userId != null and !&quot;&quot;.equals(chatInfo.userId)">
-                and user_id=#{chatInfo.userId}
-            </if>
-            <if test="chatInfo.toUserId != null and !&quot;&quot;.equals(chatInfo.toUserId)">
-                and to_user_id=#{chatInfo.toUserId}
-            </if>
-            <if test="chatInfo.contentType != null and !&quot;&quot;.equals(chatInfo.contentType)">
-                and content_type=#{chatInfo.contentType}
-            </if>
-        </where>
-        LIMIT 1
-    </select>
-
-
-    <update id="delete">
-        UPDATE chat_info SET state = 2
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <update id="readAll">
-        UPDATE chat_info
-        SET state = 1
-        WHERE
-        user_id = #{userId}
-        AND store_id = #{storeId}
-        <if test="serviceName != null and !&quot;&quot;.equals(serviceName)">
-            AND service_name = #{serviceName}
-        </if>
-        <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-            AND type_flag = #{typeFlag}
-        </if>
-    </update>
-
-</mapper>

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/CompanyAuthenticationMapper.java

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

File diff suppressed because it is too large
+ 0 - 594
src/main/java/com/izouma/awesomeadmin/dao/CompanyAuthenticationMapper.xml


+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/CompanyTypeMapper.java

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

+ 0 - 388
src/main/java/com/izouma/awesomeadmin/dao/CompanyTypeMapper.xml

@@ -1,388 +0,0 @@
-<?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.CompanyTypeMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CompanyType" >
-                <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="type_name" property="typeName" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            type_name,
-
-            remark,
-
-            rank,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from company_type
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from company_type
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CompanyType" useGeneratedKeys="true" keyProperty="id">
-        insert into company_type
-        <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="typeName!= null" >
-                type_name,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </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="typeName != null" >
-                #{typeName,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CompanyType" >
-        update company_type
-        <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="typeName != null" >
-               type_name= #{typeName,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </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="queryCompanyTypeByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompanyType">
-        select <include refid="Base_Column_List"/> from company_type
-        <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.typeName != null and !&quot;&quot;.equals(record.typeName)">
-                and  type_name = #{record.typeName}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  type_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank 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>
-        rank desc ,id desc
-    </select>
-    <select id="queryAllCompanyType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompanyType">
-        select <include refid="Base_Column_List"/> from company_type
-        <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="typeName != null and !&quot;&quot;.equals(typeName)">
-                and  type_name = #{typeName}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  type_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank 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>
-
-        rank desc , id desc
-    </select>
-    <select id="queryCompanyType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompanyType">
-        select <include refid="Base_Column_List"/> from company_type
-        <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="typeName != null and !&quot;&quot;.equals(typeName)">
-                and type_name = #{typeName}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE company_type SET del_flag = 'Y'
-        where
-
-            id = #{id}
-
-
-
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompanyType">
-        select <include refid="Base_Column_List"/> from company_type
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ContactUsMapper.java

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

+ 0 - 441
src/main/java/com/izouma/awesomeadmin/dao/ContactUsMapper.xml

@@ -1,441 +0,0 @@
-<?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.ContactUsMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ContactUs" >
-                <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="company_name" property="companyName" jdbcType="VARCHAR" />
-                                <result column="telephone" property="telephone" jdbcType="VARCHAR" />
-                                <result column="faxes" property="faxes" jdbcType="VARCHAR" />
-                                <result column="postcode" property="postcode" jdbcType="VARCHAR" />
-                                <result column="address" property="address" jdbcType="VARCHAR" />
-                                <result column="service_time" property="serviceTime" jdbcType="VARCHAR" />
-                                <result column="service_phone" property="servicePhone" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            company_name,
-
-            telephone,
-
-            faxes,
-
-            postcode,
-
-            address,
-
-            service_time,
-
-            service_phone,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from contact_us
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from contact_us
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ContactUs" useGeneratedKeys="true" keyProperty="id">
-        insert into contact_us
-        <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="companyName!= null" >
-                company_name,
-            </if>
-                <if test="telephone!= null" >
-                telephone,
-            </if>
-                <if test="faxes!= null" >
-                faxes,
-            </if>
-                <if test="postcode!= null" >
-                postcode,
-            </if>
-                <if test="address!= null" >
-                address,
-            </if>
-                <if test="serviceTime!= null" >
-                service_time,
-            </if>
-                <if test="servicePhone!= null" >
-                service_phone,
-            </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="companyName != null" >
-                #{companyName,jdbcType=VARCHAR},
-            </if>
-                    <if test="telephone != null" >
-                #{telephone,jdbcType=VARCHAR},
-            </if>
-                    <if test="faxes != null" >
-                #{faxes,jdbcType=VARCHAR},
-            </if>
-                    <if test="postcode != null" >
-                #{postcode,jdbcType=VARCHAR},
-            </if>
-                    <if test="address != null" >
-                #{address,jdbcType=VARCHAR},
-            </if>
-                    <if test="serviceTime != null" >
-                #{serviceTime,jdbcType=VARCHAR},
-            </if>
-                    <if test="servicePhone != null" >
-                #{servicePhone,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ContactUs" >
-        update contact_us
-        <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="companyName != null" >
-               company_name= #{companyName,jdbcType=VARCHAR},
-            </if>
-                     <if test="telephone != null" >
-               telephone= #{telephone,jdbcType=VARCHAR},
-            </if>
-                     <if test="faxes != null" >
-               faxes= #{faxes,jdbcType=VARCHAR},
-            </if>
-                     <if test="postcode != null" >
-               postcode= #{postcode,jdbcType=VARCHAR},
-            </if>
-                     <if test="address != null" >
-               address= #{address,jdbcType=VARCHAR},
-            </if>
-                     <if test="serviceTime != null" >
-               service_time= #{serviceTime,jdbcType=VARCHAR},
-            </if>
-                     <if test="servicePhone != null" >
-               service_phone= #{servicePhone,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryContactUsByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ContactUs">
-        select <include refid="Base_Column_List"/> from contact_us
-        <where>
-            and del_flag = 'N'
-                    <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.companyName != null and !&quot;&quot;.equals(record.companyName)">
-                and  company_name = #{record.companyName}
-            </if>
-                     <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
-                and  telephone = #{record.telephone}
-            </if>
-                     <if test="record.faxes != null and !&quot;&quot;.equals(record.faxes)">
-                and  faxes = #{record.faxes}
-            </if>
-                     <if test="record.postcode != null and !&quot;&quot;.equals(record.postcode)">
-                and  postcode = #{record.postcode}
-            </if>
-                     <if test="record.address != null and !&quot;&quot;.equals(record.address)">
-                and  address = #{record.address}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  company_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  telephone LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  faxes LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  postcode LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  address 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="queryAllContactUs" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ContactUs">
-        select <include refid="Base_Column_List"/> from contact_us
-        <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="companyName != null and !&quot;&quot;.equals(companyName)">
-                and  company_name = #{companyName}
-            </if>
-                    <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and  telephone = #{telephone}
-            </if>
-                    <if test="faxes != null and !&quot;&quot;.equals(faxes)">
-                and  faxes = #{faxes}
-            </if>
-                    <if test="postcode != null and !&quot;&quot;.equals(postcode)">
-                and  postcode = #{postcode}
-            </if>
-                    <if test="address != null and !&quot;&quot;.equals(address)">
-                and  address = #{address}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  company_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  telephone LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  faxes LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  postcode LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  address 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="queryContactUs" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ContactUs">
-        select <include refid="Base_Column_List"/> from contact_us
-        <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="companyName != null and !&quot;&quot;.equals(companyName)">
-                and company_name = #{companyName}
-            </if>
-                     <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-                     <if test="faxes != null and !&quot;&quot;.equals(faxes)">
-                and faxes = #{faxes}
-            </if>
-                     <if test="postcode != null and !&quot;&quot;.equals(postcode)">
-                and postcode = #{postcode}
-            </if>
-                     <if test="address != null and !&quot;&quot;.equals(address)">
-                and address = #{address}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE contact_us SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ContactUs">
-        select <include refid="Base_Column_List"/> from contact_us
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/CouponInfoMapper.java

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

+ 0 - 463
src/main/java/com/izouma/awesomeadmin/dao/CouponInfoMapper.xml

@@ -1,463 +0,0 @@
-<?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.CouponInfoMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CouponInfo" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="name" property="name" jdbcType="VARCHAR" />
-                                <result column="discription" property="discription" jdbcType="VARCHAR" />
-                                <result column="discount_money" property="discountMoney" jdbcType="VARCHAR" />
-                                <result column="limit_money" property="limitMoney" jdbcType="VARCHAR" />
-                                <result column="type_flag" property="typeFlag" jdbcType="INTEGER" />
-                                <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
-                                <result column="available_days" property="availableDays" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            name,
-
-            discription,
-
-            discount_money,
-
-            limit_money,
-
-            type_flag,
-
-            status_flag,
-
-            available_days,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from coupon_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from coupon_info
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CouponInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into coupon_info
-        <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="name!= null" >
-                name,
-            </if>
-                <if test="discription!= null" >
-                discription,
-            </if>
-                <if test="discountMoney!= null" >
-                discount_money,
-            </if>
-                <if test="limitMoney!= null" >
-                limit_money,
-            </if>
-                <if test="typeFlag!= null" >
-                type_flag,
-            </if>
-                <if test="statusFlag!= null" >
-                status_flag,
-            </if>
-                <if test="availableDays!= null" >
-                available_days,
-            </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="name != null" >
-                #{name,jdbcType=VARCHAR},
-            </if>
-                    <if test="discription != null" >
-                #{discription,jdbcType=VARCHAR},
-            </if>
-                    <if test="discountMoney != null" >
-                #{discountMoney,jdbcType=VARCHAR},
-            </if>
-                    <if test="limitMoney != null" >
-                #{limitMoney,jdbcType=VARCHAR},
-            </if>
-                    <if test="typeFlag != null" >
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-                    <if test="statusFlag != null" >
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-                    <if test="availableDays != null" >
-                #{availableDays,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CouponInfo" >
-        update coupon_info
-        <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="name != null" >
-               name= #{name,jdbcType=VARCHAR},
-            </if>
-                     <if test="discription != null" >
-               discription= #{discription,jdbcType=VARCHAR},
-            </if>
-                     <if test="discountMoney != null" >
-               discount_money= #{discountMoney,jdbcType=VARCHAR},
-            </if>
-                     <if test="limitMoney != null" >
-               limit_money= #{limitMoney,jdbcType=VARCHAR},
-            </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-                     <if test="statusFlag != null" >
-               status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-                     <if test="availableDays != null" >
-               available_days= #{availableDays,jdbcType=INTEGER},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryCouponInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CouponInfo">
-        select <include refid="Base_Column_List"/> from coupon_info
-        <where>
-            and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
-            </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
-            </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
-            </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
-            </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
-            </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
-            </if>
-                     <if test="record.name != null and !&quot;&quot;.equals(record.name)">
-                and  name = #{record.name}
-            </if>
-                     <if test="record.discription != null and !&quot;&quot;.equals(record.discription)">
-                and  discription = #{record.discription}
-            </if>
-                     <if test="record.discountMoney != null and !&quot;&quot;.equals(record.discountMoney)">
-                and  discount_money = #{record.discountMoney}
-            </if>
-                     <if test="record.limitMoney != null and !&quot;&quot;.equals(record.limitMoney)">
-                and  limit_money = #{record.limitMoney}
-            </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
-            </if>
-                     <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and  status_flag = #{record.statusFlag}
-            </if>
-                     <if test="record.availableDays != null and !&quot;&quot;.equals(record.availableDays)">
-                and  available_days = #{record.availableDays}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  discription LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  discount_money LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  limit_money LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  status_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  available_days 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="queryAllCouponInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CouponInfo">
-        select <include refid="Base_Column_List"/> from coupon_info
-        <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="name != null and !&quot;&quot;.equals(name)">
-                and  name = #{name}
-            </if>
-                    <if test="discription != null and !&quot;&quot;.equals(discription)">
-                and  discription = #{discription}
-            </if>
-                    <if test="discountMoney != null and !&quot;&quot;.equals(discountMoney)">
-                and  discount_money = #{discountMoney}
-            </if>
-                    <if test="limitMoney != null and !&quot;&quot;.equals(limitMoney)">
-                and  limit_money = #{limitMoney}
-            </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
-            </if>
-                    <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and  status_flag = #{statusFlag}
-            </if>
-                    <if test="availableDays != null and !&quot;&quot;.equals(availableDays)">
-                and  available_days = #{availableDays}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  discription LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  discount_money LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  limit_money LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  status_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  available_days 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="queryCouponInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CouponInfo">
-        select <include refid="Base_Column_List"/> from coupon_info
-        <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="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-                     <if test="discription != null and !&quot;&quot;.equals(discription)">
-                and discription = #{discription}
-            </if>
-                     <if test="discountMoney != null and !&quot;&quot;.equals(discountMoney)">
-                and discount_money = #{discountMoney}
-            </if>
-                     <if test="limitMoney != null and !&quot;&quot;.equals(limitMoney)">
-                and limit_money = #{limitMoney}
-            </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-                     <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-                     <if test="availableDays != null and !&quot;&quot;.equals(availableDays)">
-                and available_days = #{availableDays}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE coupon_info SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CouponInfo">
-        select <include refid="Base_Column_List"/> from coupon_info
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/CreditRatingMapper.java

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

+ 0 - 390
src/main/java/com/izouma/awesomeadmin/dao/CreditRatingMapper.xml

@@ -1,390 +0,0 @@
-<?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.CreditRatingMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CreditRating" >
-                <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="credit" property="credit" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            credit,
-
-            remark,
-
-            rank,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from credit_rating
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from credit_rating
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CreditRating" useGeneratedKeys="true" keyProperty="id">
-        insert into credit_rating
-        <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="credit!= null" >
-                credit,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </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="credit != null" >
-                #{credit,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CreditRating" >
-        update credit_rating
-        <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="credit != null" >
-               credit= #{credit,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </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="queryCreditRatingByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
-        select <include refid="Base_Column_List"/> from credit_rating
-        <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.credit != null and !&quot;&quot;.equals(record.credit)">
-                and  credit = #{record.credit}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  credit LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank 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>
-        rank desc,id desc
-    </select>
-    <select id="queryAllCreditRating" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
-        select <include refid="Base_Column_List"/> from credit_rating
-        <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="credit != null and !&quot;&quot;.equals(credit)">
-                and  credit = #{credit}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  credit LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank 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>
-
-        rank desc, id desc
-    </select>
-    <select id="queryCreditRating" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
-        select <include refid="Base_Column_List"/> from credit_rating
-        <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="credit != null and !&quot;&quot;.equals(credit)">
-                and credit = #{credit}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE credit_rating 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.CreditRating">
-        select <include refid="Base_Column_List"/> from credit_rating
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 36
src/main/java/com/izouma/awesomeadmin/dao/CustomerServiceMapper.java

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

+ 0 - 532
src/main/java/com/izouma/awesomeadmin/dao/CustomerServiceMapper.xml

@@ -1,532 +0,0 @@
-<?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.CustomerServiceMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CustomerService">
-        <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="store_id" property="storeId" jdbcType="VARCHAR"/>
-        <result column="service_name" property="serviceName" jdbcType="VARCHAR"/>
-        <result column="password" property="password" jdbcType="VARCHAR"/>
-        <result column="username" property="username" jdbcType="VARCHAR"/>
-        <result column="icon" property="icon" jdbcType="VARCHAR"/>
-        <result column="use_flag" property="useFlag" jdbcType="CHAR"/>
-        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
-        <result column="login_time" property="loginTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            store_id,
-
-            service_name,
-
-            password,
-
-            username,
-
-            icon,
-
-            use_flag,
-
-            status_flag,
-
-            login_time,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from customer_service
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from customer_service
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CustomerService" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into customer_service
-        <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="storeId!= null">
-                store_id,
-            </if>
-            <if test="serviceName!= null">
-                service_name,
-            </if>
-            <if test="password!= null">
-                password,
-            </if>
-            <if test="username!= null">
-                username,
-            </if>
-            <if test="icon!= null">
-                icon,
-            </if>
-            <if test="useFlag!= null">
-                use_flag,
-            </if>
-            <if test="statusFlag!= null">
-                status_flag,
-            </if>
-            <if test="loginTime!= null">
-                login_time,
-            </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="storeId != null">
-                #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="serviceName != null">
-                #{serviceName,jdbcType=VARCHAR},
-            </if>
-            <if test="password != null">
-                #{password,jdbcType=VARCHAR},
-            </if>
-            <if test="username != null">
-                #{username,jdbcType=VARCHAR},
-            </if>
-            <if test="icon != null">
-                #{icon,jdbcType=VARCHAR},
-            </if>
-            <if test="useFlag != null">
-                #{useFlag,jdbcType=CHAR},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="loginTime != null">
-                #{loginTime,jdbcType=TIMESTAMP},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CustomerService">
-        update customer_service
-        <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="storeId != null">
-                store_id= #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="serviceName != null">
-                service_name= #{serviceName,jdbcType=VARCHAR},
-            </if>
-            <if test="password != null">
-                password= #{password,jdbcType=VARCHAR},
-            </if>
-            <if test="username != null">
-                username= #{username,jdbcType=VARCHAR},
-            </if>
-            <if test="icon != null">
-                icon= #{icon,jdbcType=VARCHAR},
-            </if>
-            <if test="useFlag != null">
-                use_flag= #{useFlag,jdbcType=CHAR},
-            </if>
-            <if test="statusFlag != null">
-                status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="loginTime != null">
-                login_time= #{loginTime,jdbcType=TIMESTAMP},
-            </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="queryCustomerServiceByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.CustomerService">
-        select
-        <include refid="Base_Column_List"/>
-        from customer_service
-        <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.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and store_id = #{record.storeId}
-            </if>
-            <if test="record.serviceName != null and !&quot;&quot;.equals(record.serviceName)">
-                and service_name = #{record.serviceName}
-            </if>
-            <if test="record.password != null and !&quot;&quot;.equals(record.password)">
-                and password = #{record.password}
-            </if>
-            <if test="record.username != null and !&quot;&quot;.equals(record.username)">
-                and username = #{record.username}
-            </if>
-            <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
-                and icon = #{record.icon}
-            </if>
-            <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
-                and use_flag = #{record.useFlag}
-            </if>
-            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and status_flag = #{record.statusFlag}
-            </if>
-            <if test="record.loginTime != null and !&quot;&quot;.equals(record.loginTime)">
-                and login_time = #{record.loginTime}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR store_id LIKE concat('%',#{record.searchKey},'%')
-                    OR service_name LIKE concat('%',#{record.searchKey},'%')
-                    OR password LIKE concat('%',#{record.searchKey},'%')
-                    OR username LIKE concat('%',#{record.searchKey},'%')
-                    OR icon LIKE concat('%',#{record.searchKey},'%')
-                    OR use_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR login_time 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="queryAllCustomerService" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.CustomerService">
-        select
-        <include refid="Base_Column_List"/>
-        from customer_service
-        <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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="serviceName != null and !&quot;&quot;.equals(serviceName)">
-                and service_name = #{serviceName}
-            </if>
-            <if test="password != null and !&quot;&quot;.equals(password)">
-                and password = #{password}
-            </if>
-            <if test="username != null and !&quot;&quot;.equals(username)">
-                and username = #{username}
-            </if>
-            <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and icon = #{icon}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="loginTime != null and !&quot;&quot;.equals(loginTime)">
-                and login_time = #{loginTime}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR store_id LIKE concat('%',#{searchKey},'%')
-                    OR service_name LIKE concat('%',#{searchKey},'%')
-                    OR password LIKE concat('%',#{searchKey},'%')
-                    OR username LIKE concat('%',#{searchKey},'%')
-                    OR icon LIKE concat('%',#{searchKey},'%')
-                    OR use_flag LIKE concat('%',#{searchKey},'%')
-                    OR status_flag LIKE concat('%',#{searchKey},'%')
-                    OR login_time 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="queryCustomerService" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.CustomerService">
-        select
-        <include refid="Base_Column_List"/>
-        from customer_service
-        <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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="serviceName != null and !&quot;&quot;.equals(serviceName)">
-                and service_name = #{serviceName}
-            </if>
-            <if test="password != null and !&quot;&quot;.equals(password)">
-                and password = #{password}
-            </if>
-            <if test="username != null and !&quot;&quot;.equals(username)">
-                and username = #{username}
-            </if>
-            <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and icon = #{icon}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="loginTime != null and !&quot;&quot;.equals(loginTime)">
-                and login_time = #{loginTime}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE customer_service SET del_flag = 'Y'
-        where
-        <if test="id != null and !&quot;&quot;.equals(id)">
-            id = #{id}
-        </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.CustomerService">
-        select
-        <include refid="Base_Column_List"/>
-        from customer_service
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-    <select id="getRecentlyLoginList" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.CustomerService">
-        select
-        <include refid="Base_Column_List"/>
-        from customer_service
-        <where>
-            and del_flag = 'N'
-            and use_flag = 'Y'
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-        </where>
-        order by login_time desc
-        LIMIT 3
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/DistrictInfoMapper.java

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

+ 0 - 394
src/main/java/com/izouma/awesomeadmin/dao/DistrictInfoMapper.xml

@@ -1,394 +0,0 @@
-<?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.DistrictInfoMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.DistrictInfo" >
-                <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="code" property="code" jdbcType="VARCHAR" />
-                                <result column="district_name" property="districtName" jdbcType="VARCHAR" />
-                                <result column="description" property="description" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            code,
-
-            district_name,
-
-            description,
-
-            rank,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from district_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from district_info
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.DistrictInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into district_info
-        <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="code!= null" >
-                code,
-            </if>
-                <if test="districtName!= null" >
-                district_name,
-            </if>
-                <if test="description!= null" >
-                description,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </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="code != null" >
-                #{code,jdbcType=VARCHAR},
-            </if>
-                    <if test="districtName != null" >
-                #{districtName,jdbcType=VARCHAR},
-            </if>
-                    <if test="description != null" >
-                #{description,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.DistrictInfo" >
-        update district_info
-        <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="code != null" >
-               code= #{code,jdbcType=VARCHAR},
-            </if>
-                     <if test="districtName != null" >
-               district_name= #{districtName,jdbcType=VARCHAR},
-            </if>
-                     <if test="description != null" >
-               description= #{description,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryDistrictInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.DistrictInfo">
-        select <include refid="Base_Column_List"/> from district_info
-        <where>
-            and del_flag = 'N'
-                    <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.code != null and !&quot;&quot;.equals(record.code)">
-                and  code = #{record.code}
-            </if>
-                     <if test="record.districtName != null and !&quot;&quot;.equals(record.districtName)">
-                and  district_name = #{record.districtName}
-            </if>
-                     <if test="record.description != null and !&quot;&quot;.equals(record.description)">
-                and  description = #{record.description}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  code LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  district_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  description LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank 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>
-       rank desc, id desc
-    </select>
-    <select id="queryAllDistrictInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.DistrictInfo">
-        select <include refid="Base_Column_List"/> from district_info
-        <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="code != null and !&quot;&quot;.equals(code)">
-                and  code = #{code}
-            </if>
-                    <if test="districtName != null and !&quot;&quot;.equals(districtName)">
-                and  district_name = #{districtName}
-            </if>
-                    <if test="description != null and !&quot;&quot;.equals(description)">
-                and  description = #{description}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  code LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  district_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  description LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank 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>
-
-        rank desc , id desc
-    </select>
-    <select id="queryDistrictInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.DistrictInfo">
-        select <include refid="Base_Column_List"/> from district_info
-        <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="code != null and !&quot;&quot;.equals(code)">
-                and code = #{code}
-            </if>
-                     <if test="districtName != null and !&quot;&quot;.equals(districtName)">
-                and district_name = #{districtName}
-            </if>
-                     <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE district_info SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.DistrictInfo">
-        select <include refid="Base_Column_List"/> from district_info
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/FeedbackMapper.java

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

+ 0 - 417
src/main/java/com/izouma/awesomeadmin/dao/FeedbackMapper.xml

@@ -1,417 +0,0 @@
-<?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.FeedbackMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.Feedback" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
-                                <result column="user_name" property="userName" jdbcType="VARCHAR" />
-                                <result column="telephone" property="telephone" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="image" property="image" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            user_name,
-
-            telephone,
-
-            remark,
-
-            image,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from feedback
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from feedback
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.Feedback" useGeneratedKeys="true" keyProperty="id">
-        insert into feedback
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="updateTime!= null" >
-                update_time,
-            </if>
-                <if test="updateUser!= null" >
-                update_user,
-            </if>
-                <if test="createTime!= null" >
-                create_time,
-            </if>
-                <if test="createUser!= null" >
-                create_user,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="userName!= null" >
-                user_name,
-            </if>
-                <if test="telephone!= null" >
-                telephone,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="image!= null" >
-                image,
-            </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
-                #{id,jdbcType=INTEGER},
-            </if>
-                    <if test="delFlag != null" >
-                #{delFlag,jdbcType=CHAR},
-            </if>
-                    <if test="updateTime != null" >
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="updateUser != null" >
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="createTime != null" >
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="createUser != null" >
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=VARCHAR},
-            </if>
-                    <if test="userName != null" >
-                #{userName,jdbcType=VARCHAR},
-            </if>
-                    <if test="telephone != null" >
-                #{telephone,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="image != null" >
-                #{image,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.Feedback" >
-        update feedback
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-                     <if test="userName != null" >
-               user_name= #{userName,jdbcType=VARCHAR},
-            </if>
-                     <if test="telephone != null" >
-               telephone= #{telephone,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="image != null" >
-               image= #{image,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryFeedbackByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Feedback">
-        select <include refid="Base_Column_List"/> from feedback
-        <where>
-            and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
-            </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
-            </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
-            </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
-            </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
-            </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
-            </if>
-                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and  user_id = #{record.userId}
-            </if>
-                     <if test="record.userName != null and !&quot;&quot;.equals(record.userName)">
-                and  user_name = #{record.userName}
-            </if>
-                     <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
-                and  telephone = #{record.telephone}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.image != null and !&quot;&quot;.equals(record.image)">
-                and  image = #{record.image}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  telephone LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image 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="queryAllFeedback" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Feedback">
-        select <include refid="Base_Column_List"/> from feedback
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
-            </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
-            </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
-            </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
-            </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
-            </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
-            </if>
-                    <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and  user_id = #{userId}
-            </if>
-                    <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and  user_name = #{userName}
-            </if>
-                    <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and  telephone = #{telephone}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="image != null and !&quot;&quot;.equals(image)">
-                and  image = #{image}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  telephone LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image 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="queryFeedback" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Feedback">
-        select <include refid="Base_Column_List"/> from feedback
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-                     <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-                     <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and user_name = #{userName}
-            </if>
-                     <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE feedback SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Feedback">
-        select <include refid="Base_Column_List"/> from feedback
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/HelpTextMapper.java

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

+ 0 - 394
src/main/java/com/izouma/awesomeadmin/dao/HelpTextMapper.xml

@@ -1,394 +0,0 @@
-<?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.HelpTextMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.HelpText" >
-                <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="title" property="title" jdbcType="VARCHAR" />
-                                <result column="content" property="content" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="type_flag" property="typeFlag" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            title,
-
-            content,
-
-            remark,
-
-            type_flag,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from help_text
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from help_text
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.HelpText" useGeneratedKeys="true" keyProperty="id">
-        insert into help_text
-        <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="title!= null" >
-                title,
-            </if>
-                <if test="content!= null" >
-                content,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="typeFlag!= null" >
-                type_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="title != null" >
-                #{title,jdbcType=VARCHAR},
-            </if>
-                    <if test="content != null" >
-                #{content,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="typeFlag != null" >
-                #{typeFlag,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.HelpText" >
-        update help_text
-        <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="title != null" >
-               title= #{title,jdbcType=VARCHAR},
-            </if>
-                     <if test="content != null" >
-               content= #{content,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryHelpTextByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.HelpText">
-        select <include refid="Base_Column_List"/> from help_text
-        <where>
-            and del_flag = 'N'
-                    <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.title != null and !&quot;&quot;.equals(record.title)">
-                and  title = #{record.title}
-            </if>
-                     <if test="record.content != null and !&quot;&quot;.equals(record.content)">
-                and  content = #{record.content}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  title LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  content LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_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="queryAllHelpText" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.HelpText">
-        select <include refid="Base_Column_List"/> from help_text
-        <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="title != null and !&quot;&quot;.equals(title)">
-                and  title = #{title}
-            </if>
-                    <if test="content != null and !&quot;&quot;.equals(content)">
-                and  content = #{content}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  title LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  content LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_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="queryHelpText" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.HelpText">
-        select <include refid="Base_Column_List"/> from help_text
-        <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="title != null and !&quot;&quot;.equals(title)">
-                and title = #{title}
-            </if>
-                     <if test="content != null and !&quot;&quot;.equals(content)">
-                and content = #{content}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE help_text SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.HelpText">
-        select <include refid="Base_Column_List"/> from help_text
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ImageDownLogMapper.java

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

+ 0 - 519
src/main/java/com/izouma/awesomeadmin/dao/ImageDownLogMapper.xml

@@ -1,519 +0,0 @@
-<?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.ImageDownLogMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ImageDownLog">
-        <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="order_id" property="orderId" jdbcType="VARCHAR"/>
-        <result column="type_flag" property="typeFlag" jdbcType="VARCHAR"/>
-        <result column="image_name" property="imageName" jdbcType="VARCHAR"/>
-        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
-        <result column="image_size" property="imageSize" jdbcType="DECIMAL"/>
-        <result column="image_code" property="imageCode" jdbcType="VARCHAR"/>
-        <result column="total_num" property="totalNum" jdbcType="INTEGER"/>
-        <result column="now_num" property="nowNum" jdbcType="INTEGER"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            order_id,
-
-            type_flag,
-
-            image_name,
-
-            status_flag,
-
-            image_size,
-
-            image_code,
-
-            total_num,
-
-            now_num,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from image_down_log
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from image_down_log
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ImageDownLog" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into image_down_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="orderId!= null">
-                order_id,
-            </if>
-            <if test="typeFlag!= null">
-                type_flag,
-            </if>
-            <if test="imageName!= null">
-                image_name,
-            </if>
-            <if test="statusFlag!= null">
-                status_flag,
-            </if>
-            <if test="imageSize!= null">
-                image_size,
-            </if>
-            <if test="imageCode!= null">
-                image_code,
-            </if>
-            <if test="totalNum!= null">
-                total_num,
-            </if>
-            <if test="nowNum!= null">
-                now_num,
-            </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="orderId != null">
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="imageName != null">
-                #{imageName,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="imageSize != null">
-                #{imageSize,jdbcType=DECIMAL},
-            </if>
-            <if test="imageCode != null">
-                #{imageCode,jdbcType=VARCHAR},
-            </if>
-            <if test="totalNum != null">
-                #{totalNum,jdbcType=INTEGER},
-            </if>
-            <if test="nowNum != null">
-                #{nowNum,jdbcType=INTEGER},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ImageDownLog">
-        update image_down_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="orderId != null">
-                order_id= #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="imageName != null">
-                image_name= #{imageName,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="imageSize != null">
-                image_size= #{imageSize,jdbcType=DECIMAL},
-            </if>
-            <if test="imageCode != null">
-                image_code= #{imageCode,jdbcType=VARCHAR},
-            </if>
-            <if test="totalNum != null">
-                total_num= #{totalNum,jdbcType=INTEGER},
-            </if>
-            <if test="nowNum != null">
-                now_num= #{nowNum,jdbcType=INTEGER},
-            </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="queryImageDownLogByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ImageDownLog">
-        select
-        <include refid="Base_Column_List"/>
-        from image_down_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.orderId != null and !&quot;&quot;.equals(record.orderId)">
-                and order_id = #{record.orderId}
-            </if>
-            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.imageName != null and !&quot;&quot;.equals(record.imageName)">
-                and image_name = #{record.imageName}
-            </if>
-            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and status_flag = #{record.statusFlag}
-            </if>
-            <if test="record.imageSize != null and !&quot;&quot;.equals(record.imageSize)">
-                and image_size = #{record.imageSize}
-            </if>
-            <if test="record.imageCode != null and !&quot;&quot;.equals(record.imageCode)">
-                and image_code = #{record.imageCode}
-            </if>
-            <if test="record.totalNum != null and !&quot;&quot;.equals(record.totalNum)">
-                and total_num = #{record.totalNum}
-            </if>
-            <if test="record.nowNum != null and !&quot;&quot;.equals(record.nowNum)">
-                and now_num = #{record.nowNum}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR order_id LIKE concat('%',#{record.searchKey},'%')
-                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR image_name LIKE concat('%',#{record.searchKey},'%')
-                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR image_size LIKE concat('%',#{record.searchKey},'%')
-                    OR image_code LIKE concat('%',#{record.searchKey},'%')
-                    OR total_num LIKE concat('%',#{record.searchKey},'%')
-                    OR now_num 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="queryAllImageDownLog" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ImageDownLog">
-        select
-        <include refid="Base_Column_List"/>
-        from image_down_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="orderId != null and !&quot;&quot;.equals(orderId)">
-                and order_id = #{orderId}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="imageName != null and !&quot;&quot;.equals(imageName)">
-                and image_name = #{imageName}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="imageSize != null and !&quot;&quot;.equals(imageSize)">
-                and image_size = #{imageSize}
-            </if>
-            <if test="imageCode != null and !&quot;&quot;.equals(imageCode)">
-                and image_code = #{imageCode}
-            </if>
-            <if test="totalNum != null and !&quot;&quot;.equals(totalNum)">
-                and total_num = #{totalNum}
-            </if>
-            <if test="nowNum != null and !&quot;&quot;.equals(nowNum)">
-                and now_num = #{nowNum}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR order_id LIKE concat('%',#{searchKey},'%')
-                    OR type_flag LIKE concat('%',#{searchKey},'%')
-                    OR image_name LIKE concat('%',#{searchKey},'%')
-                    OR status_flag LIKE concat('%',#{searchKey},'%')
-                    OR image_size LIKE concat('%',#{searchKey},'%')
-                    OR image_code LIKE concat('%',#{searchKey},'%')
-                    OR total_num LIKE concat('%',#{searchKey},'%')
-                    OR now_num 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="queryImageDownLog" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ImageDownLog">
-        select
-        <include refid="Base_Column_List"/>
-        from image_down_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="orderId != null and !&quot;&quot;.equals(orderId)">
-                and order_id = #{orderId}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="imageName != null and !&quot;&quot;.equals(imageName)">
-                and image_name = #{imageName}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="imageSize != null and !&quot;&quot;.equals(imageSize)">
-                and image_size = #{imageSize}
-            </if>
-            <if test="imageCode != null and !&quot;&quot;.equals(imageCode)">
-                and image_code = #{imageCode}
-            </if>
-            <if test="totalNum != null and !&quot;&quot;.equals(totalNum)">
-                and total_num = #{totalNum}
-            </if>
-            <if test="nowNum != null and !&quot;&quot;.equals(nowNum)">
-                and now_num = #{nowNum}
-            </if>
-
-        </where>
-        order by id desc
-        LIMIT 1
-
-    </select>
-    <update id="delete">
-        UPDATE image_down_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.ImageDownLog">
-        select
-        <include refid="Base_Column_List"/>
-        from image_down_log
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 35
src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.java

@@ -1,35 +0,0 @@
-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);
-
-    List<ImageUploadLog> queryDelOssImage(Map<String,Object> parameter);
-}
-

+ 0 - 585
src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.xml

@@ -1,585 +0,0 @@
-<?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"/>
-        <result column="artwork_url" property="artworkUrl" jdbcType="VARCHAR"/>
-    </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,
-
-            artwork_url,
-
-        </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>
-            <if test="artworkUrl!= null">
-                artwork_url,
-            </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>
-            <if test="artworkUrl != null">
-                #{artworkUrl,jdbcType=VARCHAR},
-            </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>
-            <if test="artworkUrl != null">
-                artwork_url= #{artworkUrl,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where
-        <if test="id != null and !&quot;&quot;.equals(id)">
-            id = #{id,jdbcType=INTEGER}
-        </if>
-
-        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
-            id in (${idStr})
-        </if>
-
-    </update>
-    <select id="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
-            id = #{id}
-
-    </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>
-
-    <select id="queryDelOssImage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ImageUploadLog">
-       SELECT
-	url AS url
-FROM
-	`image_upload_log`
-WHERE
-	del_flag = 'N'
-AND order_id = #{orderId}
-AND url NOT IN (
-	SELECT
-		original_image AS image_url
-	FROM
-		order_image
-	WHERE
-		del_flag = 'N'
-	AND original_image IS NOT NULL
-	AND original_image != ''
-	AND order_id = #{orderId}
-	UNION
-		SELECT
-			finished_image AS image_url
-		FROM
-			order_image
-		WHERE
-			del_flag = 'N'
-		AND finished_image IS NOT NULL
-		AND finished_image != ''
-		AND order_id = #{orderId}
-)
-UNION
-	SELECT
-		artwork_url AS url
-	FROM
-		`image_upload_log`
-	WHERE
-		del_flag = 'N'
-	AND order_id = #{orderId}
-	AND artwork_url NOT IN (
-		SELECT
-			original_artwork AS image_url
-		FROM
-			order_image
-		WHERE
-			del_flag = 'N'
-		AND original_artwork IS NOT NULL
-		AND original_artwork != ''
-		AND order_id = #{orderId}
-		UNION
-			SELECT
-				finished_artwork AS image_url
-			FROM
-				order_image
-			WHERE
-				del_flag = 'N'
-			AND finished_artwork IS NOT NULL
-			AND finished_artwork != ''
-			AND order_id = #{orderId}
-	)
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/JoinUsMapper.java

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

+ 0 - 394
src/main/java/com/izouma/awesomeadmin/dao/JoinUsMapper.xml

@@ -1,394 +0,0 @@
-<?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.JoinUsMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.JoinUs" >
-                <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="manifesto" property="manifesto" jdbcType="VARCHAR" />
-                                <result column="email" property="email" jdbcType="VARCHAR" />
-                                <result column="telephone" property="telephone" jdbcType="VARCHAR" />
-                                <result column="zhaopin" property="zhaopin" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            manifesto,
-
-            email,
-
-            telephone,
-
-            zhaopin,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from join_us
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from join_us
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.JoinUs" useGeneratedKeys="true" keyProperty="id">
-        insert into join_us
-        <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="manifesto!= null" >
-                manifesto,
-            </if>
-                <if test="email!= null" >
-                email,
-            </if>
-                <if test="telephone!= null" >
-                telephone,
-            </if>
-                <if test="zhaopin!= null" >
-                zhaopin,
-            </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="manifesto != null" >
-                #{manifesto,jdbcType=VARCHAR},
-            </if>
-                    <if test="email != null" >
-                #{email,jdbcType=VARCHAR},
-            </if>
-                    <if test="telephone != null" >
-                #{telephone,jdbcType=VARCHAR},
-            </if>
-                    <if test="zhaopin != null" >
-                #{zhaopin,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.JoinUs" >
-        update join_us
-        <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="manifesto != null" >
-               manifesto= #{manifesto,jdbcType=VARCHAR},
-            </if>
-                     <if test="email != null" >
-               email= #{email,jdbcType=VARCHAR},
-            </if>
-                     <if test="telephone != null" >
-               telephone= #{telephone,jdbcType=VARCHAR},
-            </if>
-                     <if test="zhaopin != null" >
-               zhaopin= #{zhaopin,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryJoinUsByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.JoinUs">
-        select <include refid="Base_Column_List"/> from join_us
-        <where>
-            and del_flag = 'N'
-                    <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.manifesto != null and !&quot;&quot;.equals(record.manifesto)">
-                and  manifesto = #{record.manifesto}
-            </if>
-                     <if test="record.email != null and !&quot;&quot;.equals(record.email)">
-                and  email = #{record.email}
-            </if>
-                     <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
-                and  telephone = #{record.telephone}
-            </if>
-                     <if test="record.zhaopin != null and !&quot;&quot;.equals(record.zhaopin)">
-                and  zhaopin = #{record.zhaopin}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  manifesto LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  email LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  telephone LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  zhaopin 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="queryAllJoinUs" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.JoinUs">
-        select <include refid="Base_Column_List"/> from join_us
-        <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="manifesto != null and !&quot;&quot;.equals(manifesto)">
-                and  manifesto = #{manifesto}
-            </if>
-                    <if test="email != null and !&quot;&quot;.equals(email)">
-                and  email = #{email}
-            </if>
-                    <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and  telephone = #{telephone}
-            </if>
-                    <if test="zhaopin != null and !&quot;&quot;.equals(zhaopin)">
-                and  zhaopin = #{zhaopin}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  manifesto LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  email LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  telephone LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  zhaopin 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="queryJoinUs" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.JoinUs">
-        select <include refid="Base_Column_List"/> from join_us
-        <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="manifesto != null and !&quot;&quot;.equals(manifesto)">
-                and manifesto = #{manifesto}
-            </if>
-                     <if test="email != null and !&quot;&quot;.equals(email)">
-                and email = #{email}
-            </if>
-                     <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-                     <if test="zhaopin != null and !&quot;&quot;.equals(zhaopin)">
-                and zhaopin = #{zhaopin}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE join_us SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.JoinUs">
-        select <include refid="Base_Column_List"/> from join_us
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/LogisticsInfoMapper.java

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

+ 0 - 245
src/main/java/com/izouma/awesomeadmin/dao/LogisticsInfoMapper.xml

@@ -1,245 +0,0 @@
-<?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.LogisticsInfoMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.LogisticsInfo">
-        <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="name" property="name" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            code,
-
-            name,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from logistics_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from logistics_info
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.LogisticsInfo" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into logistics_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="code!= null">
-                code,
-            </if>
-            <if test="name!= null">
-                name,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="code != null">
-                #{code,jdbcType=VARCHAR},
-            </if>
-            <if test="name != null">
-                #{name,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LogisticsInfo">
-        update logistics_info
-        <set>
-            <if test="code != null">
-                code= #{code,jdbcType=VARCHAR},
-            </if>
-            <if test="name != null">
-                name= #{name,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where
-        <if test="id != null and !&quot;&quot;.equals(id)">
-            id = #{id,jdbcType=INTEGER}
-        </if>
-
-        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
-            id in (${idStr})
-        </if>
-
-    </update>
-    <select id="queryLogisticsInfoByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.LogisticsInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from logistics_info
-        <where>
-            <if test="record.code != null and !&quot;&quot;.equals(record.code)">
-                and code = #{record.code}
-            </if>
-            <if test="record.name != null and !&quot;&quot;.equals(record.name)">
-                and name = #{record.name}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR code LIKE concat('%',#{record.searchKey},'%')
-                    OR name 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>
-        code
-    </select>
-    <select id="queryAllLogisticsInfo" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.LogisticsInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from logistics_info
-        <where>
-            <if test="code != null and !&quot;&quot;.equals(code)">
-                and code = #{code}
-            </if>
-            <if test="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR code LIKE concat('%',#{searchKey},'%')
-                    OR name 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>
-
-        code
-    </select>
-    <select id="queryLogisticsInfo" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.LogisticsInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from logistics_info
-        <where>
-            and del_flag = 'N'
-            <if test="code != null and !&quot;&quot;.equals(code)">
-                and code = #{code}
-            </if>
-            <if test="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE logistics_info 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.LogisticsInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from logistics_info
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/MemberCoinMapper.java

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

+ 0 - 440
src/main/java/com/izouma/awesomeadmin/dao/MemberCoinMapper.xml

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

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/MemberCoinTixianMapper.java

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

File diff suppressed because it is too large
+ 0 - 619
src/main/java/com/izouma/awesomeadmin/dao/MemberCoinTixianMapper.xml


+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/MemberPointMapper.java

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

+ 0 - 450
src/main/java/com/izouma/awesomeadmin/dao/MemberPointMapper.xml

@@ -1,450 +0,0 @@
-<?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.MemberPointMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.MemberPoint" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
-                                <result column="order_id" property="orderId" jdbcType="VARCHAR" />
-                                <result column="money" property="money" jdbcType="VARCHAR" />
-                                <result column="balance" property="balance" jdbcType="VARCHAR" />
-                                <result column="type_flag" property="typeFlag" jdbcType="INTEGER" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            order_id,
-
-            money,
-
-            balance,
-
-            type_flag,
-
-            remark,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from member_point
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from member_point
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.MemberPoint" useGeneratedKeys="true" keyProperty="id">
-        insert into member_point
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="updateTime!= null" >
-                update_time,
-            </if>
-                <if test="updateUser!= null" >
-                update_user,
-            </if>
-                <if test="createTime!= null" >
-                create_time,
-            </if>
-                <if test="createUser!= null" >
-                create_user,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="orderId!= null" >
-                order_id,
-            </if>
-                <if test="money!= null" >
-                money,
-            </if>
-                <if test="balance!= null" >
-                balance,
-            </if>
-                <if test="typeFlag!= null" >
-                type_flag,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
-                #{id,jdbcType=INTEGER},
-            </if>
-                    <if test="delFlag != null" >
-                #{delFlag,jdbcType=CHAR},
-            </if>
-                    <if test="updateTime != null" >
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="updateUser != null" >
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="createTime != null" >
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="createUser != null" >
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=VARCHAR},
-            </if>
-                    <if test="orderId != null" >
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-                    <if test="money != null" >
-                #{money,jdbcType=VARCHAR},
-            </if>
-                    <if test="balance != null" >
-                #{balance,jdbcType=VARCHAR},
-            </if>
-                    <if test="typeFlag != null" >
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.MemberPoint" >
-        update member_point
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-                     <if test="orderId != null" >
-               order_id= #{orderId,jdbcType=VARCHAR},
-            </if>
-                     <if test="money != null" >
-               money= #{money,jdbcType=VARCHAR},
-            </if>
-                     <if test="balance != null" >
-               balance= #{balance,jdbcType=VARCHAR},
-            </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryMemberPointByPage" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
-        select <include refid="Base_Column_List"/> from member_point
-        <where>
-            and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
-            </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
-            </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
-            </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
-            </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
-            </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
-            </if>
-                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and  user_id = #{record.userId}
-            </if>
-                     <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
-                and  order_id = #{record.orderId}
-            </if>
-                     <if test="record.money != null and !&quot;&quot;.equals(record.money)">
-                and  money = #{record.money}
-            </if>
-                     <if test="record.balance != null and !&quot;&quot;.equals(record.balance)">
-                and  balance = #{record.balance}
-            </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  order_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  money LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  balance LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
-
-            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
-                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-
-        </where>
-        order by
-
-        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-        id desc
-    </select>
-    <select id="queryAllMemberPoint" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MemberPoint">
-        select <include refid="Base_Column_List"/> from member_point
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
-            </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
-            </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
-            </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
-            </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
-            </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
-            </if>
-                    <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and  user_id = #{userId}
-            </if>
-                    <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-                and  order_id = #{orderId}
-            </if>
-                    <if test="money != null and !&quot;&quot;.equals(money)">
-                and  money = #{money}
-            </if>
-                    <if test="balance != null and !&quot;&quot;.equals(balance)">
-                and  balance = #{balance}
-            </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  order_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  money LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  balance LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
-            </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
-
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
-
-                </foreach>
-            </otherwise>
-        </choose>
-
-
-    </foreach>
-
-
-</if>
-        </where>
-        order by
-
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-
-        id desc
-    </select>
-    <select id="queryMemberPoint" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MemberPoint">
-        select <include refid="Base_Column_List"/> from member_point
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-                     <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-                     <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-                and order_id = #{orderId}
-            </if>
-                     <if test="money != null and !&quot;&quot;.equals(money)">
-                and money = #{money}
-            </if>
-                     <if test="balance != null and !&quot;&quot;.equals(balance)">
-                and balance = #{balance}
-            </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE member_point SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.MemberPoint">
-        select <include refid="Base_Column_List"/> from member_point
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-
-    <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.MemberPoint" extends="BaseResultMap">
-
-
-        <association property="userOrder"
-                     javaType="com.izouma.awesomeadmin.model.UserOrder"
-                     select="com.izouma.awesomeadmin.dao.UserOrderMapper.queryUserOrder"
-                     column="{ id = order_id }"/>
-
-    </resultMap>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/OrderAddressMapper.java

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

+ 0 - 486
src/main/java/com/izouma/awesomeadmin/dao/OrderAddressMapper.xml

@@ -1,486 +0,0 @@
-<?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.OrderAddressMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderAddress" >
-                <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="order_id" property="orderId" jdbcType="INTEGER" />
-                                <result column="user_id" property="userId" jdbcType="INTEGER" />
-                                <result column="real_name" property="realName" jdbcType="VARCHAR" />
-                                <result column="telephone" property="telephone" jdbcType="VARCHAR" />
-                                <result column="postcode" property="postcode" jdbcType="VARCHAR" />
-                                <result column="address" property="address" jdbcType="VARCHAR" />
-                                <result column="address_detail" property="addressDetail" jdbcType="VARCHAR" />
-                                <result column="user_address_id" property="userAddressId" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            order_id,
-
-            user_id,
-
-            real_name,
-
-            telephone,
-
-            postcode,
-
-            address,
-
-            address_detail,
-
-            user_address_id,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from order_address
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from order_address
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderAddress" useGeneratedKeys="true" keyProperty="id">
-        insert into order_address
-        <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="orderId!= null" >
-                order_id,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="realName!= null" >
-                real_name,
-            </if>
-                <if test="telephone!= null" >
-                telephone,
-            </if>
-                <if test="postcode!= null" >
-                postcode,
-            </if>
-                <if test="address!= null" >
-                address,
-            </if>
-                <if test="addressDetail!= null" >
-                address_detail,
-            </if>
-                <if test="userAddressId!= null" >
-                user_address_id,
-            </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="orderId != null" >
-                #{orderId,jdbcType=INTEGER},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=INTEGER},
-            </if>
-                    <if test="realName != null" >
-                #{realName,jdbcType=VARCHAR},
-            </if>
-                    <if test="telephone != null" >
-                #{telephone,jdbcType=VARCHAR},
-            </if>
-                    <if test="postcode != null" >
-                #{postcode,jdbcType=VARCHAR},
-            </if>
-                    <if test="address != null" >
-                #{address,jdbcType=VARCHAR},
-            </if>
-                    <if test="addressDetail != null" >
-                #{addressDetail,jdbcType=VARCHAR},
-            </if>
-                    <if test="userAddressId != null" >
-                #{userAddressId,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderAddress" >
-        update order_address
-        <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="orderId != null" >
-               order_id= #{orderId,jdbcType=INTEGER},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=INTEGER},
-            </if>
-                     <if test="realName != null" >
-               real_name= #{realName,jdbcType=VARCHAR},
-            </if>
-                     <if test="telephone != null" >
-               telephone= #{telephone,jdbcType=VARCHAR},
-            </if>
-                     <if test="postcode != null" >
-               postcode= #{postcode,jdbcType=VARCHAR},
-            </if>
-                     <if test="address != null" >
-               address= #{address,jdbcType=VARCHAR},
-            </if>
-                     <if test="addressDetail != null" >
-               address_detail= #{addressDetail,jdbcType=VARCHAR},
-            </if>
-                     <if test="userAddressId != null" >
-               user_address_id= #{userAddressId,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryOrderAddressByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderAddress">
-        select <include refid="Base_Column_List"/> from order_address
-        <where>
-            and del_flag = 'N'
-                    <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.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.realName != null and !&quot;&quot;.equals(record.realName)">
-                and  real_name = #{record.realName}
-            </if>
-                     <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
-                and  telephone = #{record.telephone}
-            </if>
-                     <if test="record.postcode != null and !&quot;&quot;.equals(record.postcode)">
-                and  postcode = #{record.postcode}
-            </if>
-                     <if test="record.address != null and !&quot;&quot;.equals(record.address)">
-                and  address = #{record.address}
-            </if>
-                     <if test="record.addressDetail != null and !&quot;&quot;.equals(record.addressDetail)">
-                and  address_detail = #{record.addressDetail}
-            </if>
-                     <if test="record.userAddressId != null and !&quot;&quot;.equals(record.userAddressId)">
-                and  user_address_id = #{record.userAddressId}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  order_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  real_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  telephone LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  postcode LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  address LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  address_detail LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_address_id 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="queryAllOrderAddress" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderAddress">
-        select <include refid="Base_Column_List"/> from order_address
-        <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="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="realName != null and !&quot;&quot;.equals(realName)">
-                and  real_name = #{realName}
-            </if>
-                    <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and  telephone = #{telephone}
-            </if>
-                    <if test="postcode != null and !&quot;&quot;.equals(postcode)">
-                and  postcode = #{postcode}
-            </if>
-                    <if test="address != null and !&quot;&quot;.equals(address)">
-                and  address = #{address}
-            </if>
-                    <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and  address_detail = #{addressDetail}
-            </if>
-                    <if test="userAddressId != null and !&quot;&quot;.equals(userAddressId)">
-                and  user_address_id = #{userAddressId}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  order_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  real_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  telephone LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  postcode LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  address LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  address_detail LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_address_id 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="queryOrderAddress" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderAddress">
-        select <include refid="Base_Column_List"/> from order_address
-        <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="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="realName != null and !&quot;&quot;.equals(realName)">
-                and real_name = #{realName}
-            </if>
-                     <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-                     <if test="postcode != null and !&quot;&quot;.equals(postcode)">
-                and postcode = #{postcode}
-            </if>
-                     <if test="address != null and !&quot;&quot;.equals(address)">
-                and address = #{address}
-            </if>
-                     <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and address_detail = #{addressDetail}
-            </if>
-                     <if test="userAddressId != null and !&quot;&quot;.equals(userAddressId)">
-                and user_address_id = #{userAddressId}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE order_address SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderAddress">
-        select <include refid="Base_Column_List"/> from order_address
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 39
src/main/java/com/izouma/awesomeadmin/dao/OrderImageMapper.java

@@ -1,39 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import java.util.*;
-import com.izouma.awesomeadmin.datasource.DataSource;
-import org.springframework.stereotype.Repository;
-import com.izouma.awesomeadmin.model.OrderImage;
-
-
-/**
-*  Dao接口
-*/
-@Repository("com.zoumaframe.dao.OrderImageMapper")
-public interface OrderImageMapper{
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insertSelective(OrderImage record);
-
-    OrderImage selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(OrderImage record);
-
-    List<OrderImage> queryAllOrderImage(OrderImage record);
-
-    List<OrderImage> queryOrderImageByPage(Map<String, Object> parameter);
-
-    int delete(String id);
-
-    OrderImage queryOrderImage(OrderImage record);
-
-    List<OrderImage> query(OrderImage record);
-
-    OrderImage getMemorySize(OrderImage record);
-
-    List<OrderImage> queryAutoCleanOrderImage(OrderImage record);
-
-    OrderImage getOrderImageTotalNum(OrderImage record);
-}
-

+ 0 - 848
src/main/java/com/izouma/awesomeadmin/dao/OrderImageMapper.xml

@@ -1,848 +0,0 @@
-<?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.OrderImageMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderImage">
-        <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="order_id" property="orderId" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="VARCHAR"/>
-        <result column="store_id" property="storeId" jdbcType="VARCHAR"/>
-        <result column="original_image" property="originalImage" jdbcType="VARCHAR"/>
-        <result column="original_size" property="originalSize" jdbcType="DECIMAL"/>
-        <result column="finished_image" property="finishedImage" jdbcType="VARCHAR"/>
-        <result column="finished_size" property="finishedSize" jdbcType="DECIMAL"/>
-        <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"/>
-        <result column="original_artwork" property="originalArtwork" jdbcType="VARCHAR"/>
-        <result column="finished_artwork" property="finishedArtwork" jdbcType="VARCHAR"/>
-        <result column="download_flag" property="downloadFlag" jdbcType="CHAR"/>
-        <result column="clean_flag" property="cleanFlag" jdbcType="CHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            order_id,
-
-            user_id,
-
-            store_id,
-
-            original_image,
-
-            original_size,
-
-            finished_image,
-
-            finished_size,
-
-            deal_user,
-
-            status_flag,
-
-            remark,
-
-            image_name,
-
-            original_artwork,
-
-            finished_artwork,
-
-            download_flag,
-
-            clean_flag,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from order_image
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from order_image
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderImage" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into order_image
-        <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="orderId!= null">
-                order_id,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="storeId!= null">
-                store_id,
-            </if>
-            <if test="originalImage!= null">
-                original_image,
-            </if>
-            <if test="originalSize!= null">
-                original_size,
-            </if>
-            <if test="finishedImage!= null">
-                finished_image,
-            </if>
-            <if test="finishedSize!= null">
-                finished_size,
-            </if>
-            <if test="dealUser!= null">
-                deal_user,
-            </if>
-            <if test="statusFlag!= null">
-                status_flag,
-            </if>
-            <if test="remark!= null">
-                remark,
-            </if>
-            <if test="imageName!= null">
-                image_name,
-            </if>
-            <if test="originalArtwork!= null">
-                original_artwork,
-            </if>
-            <if test="finishedArtwork!= null">
-                finished_artwork,
-            </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="orderId != null">
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="originalImage != null">
-                #{originalImage,jdbcType=VARCHAR},
-            </if>
-            <if test="originalSize != null">
-                #{originalSize,jdbcType=DECIMAL},
-            </if>
-            <if test="finishedImage != null">
-                #{finishedImage,jdbcType=VARCHAR},
-            </if>
-            <if test="finishedSize != null">
-                #{finishedSize,jdbcType=DECIMAL},
-            </if>
-            <if test="dealUser != null">
-                #{dealUser,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="remark != null">
-                #{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="imageName != null">
-                #{imageName,jdbcType=VARCHAR},
-            </if>
-            <if test="originalArtwork != null">
-                #{originalArtwork,jdbcType=VARCHAR},
-            </if>
-            <if test="finishedArtwork != null">
-                #{finishedArtwork,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderImage">
-        update order_image
-        <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="orderId != null">
-                order_id= #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                store_id= #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="originalImage != null">
-                original_image= #{originalImage,jdbcType=VARCHAR},
-            </if>
-            <if test="originalSize != null">
-                original_size= #{originalSize,jdbcType=DECIMAL},
-            </if>
-            <if test="finishedImage != null">
-                <choose>
-                    <when test="'null'.toString()==finishedImage">
-                        finished_image = null,
-                    </when>
-                    <otherwise>
-                        finished_image= #{finishedImage,jdbcType=VARCHAR},
-                    </otherwise>
-                </choose>
-
-            </if>
-            <if test="finishedSize != null">
-                finished_size= #{finishedSize,jdbcType=DECIMAL},
-            </if>
-            <if test="dealUser != null">
-                deal_user= #{dealUser,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="remark != null">
-                remark= #{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="imageName != null">
-                image_name= #{imageName,jdbcType=VARCHAR},
-            </if>
-            <if test="originalArtwork != null">
-                original_artwork= #{originalArtwork,jdbcType=VARCHAR},
-            </if>
-            <if test="finishedArtwork != null">
-                finished_artwork= #{finishedArtwork,jdbcType=VARCHAR},
-            </if>
-            <if test="downloadFlag != null">
-                download_flag= #{downloadFlag,jdbcType=CHAR},
-            </if>
-            <if test="cleanFlag != null">
-                clean_flag= #{cleanFlag,jdbcType=CHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryOrderImageByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderImage">
-        select
-        <include refid="Base_Column_List"/>
-
-        <if test="record.repairId != null and !&quot;&quot;.equals(record.repairId)">
-            ,
-            (
-            SELECT
-            order_repair_detail.remark
-            FROM
-            order_repair_detail
-            WHERE
-            order_repair_detail.del_flag = 'N'
-            and order_repair_detail.image_id = order_image.id
-            ORDER BY order_repair_detail.id DESC
-            LIMIT 1
-            )
-
-            as detail_remark
-
-
-        </if>
-
-        from order_image
-        <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})
-            </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.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.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.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and store_id = #{record.storeId}
-            </if>
-            <if test="record.originalImage != null and !&quot;&quot;.equals(record.originalImage)">
-                and original_image = #{record.originalImage}
-            </if>
-            <if test="record.originalSize != null and !&quot;&quot;.equals(record.originalSize)">
-                and original_size = #{record.originalSize}
-            </if>
-            <if test="record.finishedImage != null and !&quot;&quot;.equals(record.finishedImage)">
-                and finished_image = #{record.finishedImage}
-            </if>
-            <if test="record.finishedSize != null and !&quot;&quot;.equals(record.finishedSize)">
-                and finished_size = #{record.finishedSize}
-            </if>
-            <if test="record.dealUser != null and !&quot;&quot;.equals(record.dealUser)">
-                and deal_user = #{record.dealUser}
-            </if>
-            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and status_flag = #{record.statusFlag}
-            </if>
-            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and remark = #{record.remark}
-            </if>
-            <if test="record.imageName != null and !&quot;&quot;.equals(record.imageName)">
-                and image_name = #{record.imageName}
-            </if>
-            <if test="record.unFinished != null and !&quot;&quot;.equals(record.unFinished)">
-                <if test="'1'.toString()==record.unFinished">
-                    and (finished_image is null or finished_image = '')
-                </if>
-                <if test="'0'.toString()==record.unFinished">
-                    and (finished_image is not null and finished_image != '')
-                </if>
-            </if>
-            <if test="record.downloadFlag != null and !&quot;&quot;.equals(record.downloadFlag)">
-                and download_flag = #{record.downloadFlag}
-            </if>
-            <if test="record.cleanFlag != null and !&quot;&quot;.equals(record.cleanFlag)">
-                and clean_flag = #{record.cleanFlag}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR order_id LIKE concat('%',#{record.searchKey},'%')
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR store_id LIKE concat('%',#{record.searchKey},'%')
-                    OR original_image LIKE concat('%',#{record.searchKey},'%')
-                    OR original_size LIKE concat('%',#{record.searchKey},'%')
-                    OR finished_image LIKE concat('%',#{record.searchKey},'%')
-                    OR finished_size LIKE concat('%',#{record.searchKey},'%')
-                    OR deal_user LIKE concat('%',#{record.searchKey},'%')
-                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR remark LIKE concat('%',#{record.searchKey},'%')
-                </trim>
-            </if>
-
-            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
-                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-
-        </where>
-        order by
-
-        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-        id desc
-    </select>
-    <select id="queryAllOrderImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
-        select
-        <include refid="Base_Column_List"/>
-        from order_image
-        <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="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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="originalImage != null and !&quot;&quot;.equals(originalImage)">
-                and original_image = #{originalImage}
-            </if>
-            <if test="originalSize != null and !&quot;&quot;.equals(originalSize)">
-                and original_size = #{originalSize}
-            </if>
-            <if test="finishedImage != null and !&quot;&quot;.equals(finishedImage)">
-                and finished_image = #{finishedImage}
-            </if>
-            <if test="finishedSize != null and !&quot;&quot;.equals(finishedSize)">
-                and finished_size = #{finishedSize}
-            </if>
-            <if test="dealUser != null and !&quot;&quot;.equals(dealUser)">
-                and deal_user = #{dealUser}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="imageName != null and !&quot;&quot;.equals(imageName)">
-                and image_name = #{imageName}
-            </if>
-            <if test="unFinished != null and !&quot;&quot;.equals(unFinished)">
-                <if test="'1'.toString()==unFinished">
-                    and (finished_image is null or finished_image = '')
-                </if>
-                <if test="'0'.toString()==unFinished">
-                    and (finished_image is not null and finished_image != '')
-                </if>
-            </if>
-            <if test="downloadFlag != null and !&quot;&quot;.equals(downloadFlag)">
-                and download_flag = #{downloadFlag}
-            </if>
-            <if test="cleanFlag != null and !&quot;&quot;.equals(cleanFlag)">
-                and clean_flag = #{cleanFlag}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR order_id LIKE concat('%',#{searchKey},'%')
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR store_id LIKE concat('%',#{searchKey},'%')
-                    OR original_image LIKE concat('%',#{searchKey},'%')
-                    OR original_size LIKE concat('%',#{searchKey},'%')
-                    OR finished_image LIKE concat('%',#{searchKey},'%')
-                    OR finished_size LIKE concat('%',#{searchKey},'%')
-                    OR deal_user LIKE concat('%',#{searchKey},'%')
-                    OR status_flag LIKE concat('%',#{searchKey},'%')
-                    OR remark LIKE concat('%',#{searchKey},'%')
-                </trim>
-            </if>
-            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-        </where>
-        order by
-
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-
-        id desc
-    </select>
-    <select id="queryOrderImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
-        select
-        <include refid="Base_Column_List"/>
-        from order_image
-        <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="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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="originalImage != null and !&quot;&quot;.equals(originalImage)">
-                and original_image = #{originalImage}
-            </if>
-            <if test="originalSize != null and !&quot;&quot;.equals(originalSize)">
-                and original_size = #{originalSize}
-            </if>
-            <if test="finishedImage != null and !&quot;&quot;.equals(finishedImage)">
-                and finished_image = #{finishedImage}
-            </if>
-            <if test="finishedSize != null and !&quot;&quot;.equals(finishedSize)">
-                and finished_size = #{finishedSize}
-            </if>
-            <if test="dealUser != null and !&quot;&quot;.equals(dealUser)">
-                and deal_user = #{dealUser}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="imageName != null and !&quot;&quot;.equals(imageName)">
-                and image_name = #{imageName}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <select id="getOrderImageTotalNum" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderImage">
-        select
-        COUNT(1) AS total_num
-        <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-            ,
-            (
-            SELECT
-            user_order.quantity
-            FROM
-            user_order
-            WHERE
-            user_order.del_flag = 'N'
-            AND user_order.id = #{orderId}
-            ) order_num
-        </if>
-
-
-        from order_image
-        <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="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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="originalImage != null and !&quot;&quot;.equals(originalImage)">
-                and original_image = #{originalImage}
-            </if>
-            <if test="originalSize != null and !&quot;&quot;.equals(originalSize)">
-                and original_size = #{originalSize}
-            </if>
-            <if test="finishedImage != null and !&quot;&quot;.equals(finishedImage)">
-                and finished_image = #{finishedImage}
-            </if>
-            <if test="finishedSize != null and !&quot;&quot;.equals(finishedSize)">
-                and finished_size = #{finishedSize}
-            </if>
-            <if test="dealUser != null and !&quot;&quot;.equals(dealUser)">
-                and deal_user = #{dealUser}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="imageName != null and !&quot;&quot;.equals(imageName)">
-                and image_name = #{imageName}
-            </if>
-
-        </where>
-    </select>
-    <select id="getMemorySize" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
-        SELECT
-        store_id,
-        ROUND(SUM(original_size) / 1024 / 1024) AS original_size,
-        ROUND(SUM(finished_size) / 1024 / 1024) AS finished_size,
-        ROUND(
-        SUM(original_size) / 1024 / 1024 + SUM(finished_size) / 1024 / 1024
-        ) AS total_size
-        FROM
-        order_image
-        <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="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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="originalImage != null and !&quot;&quot;.equals(originalImage)">
-                and original_image = #{originalImage}
-            </if>
-            <if test="originalSize != null and !&quot;&quot;.equals(originalSize)">
-                and original_size = #{originalSize}
-            </if>
-            <if test="finishedImage != null and !&quot;&quot;.equals(finishedImage)">
-                and finished_image = #{finishedImage}
-            </if>
-            <if test="finishedSize != null and !&quot;&quot;.equals(finishedSize)">
-                and finished_size = #{finishedSize}
-            </if>
-            <if test="dealUser != null and !&quot;&quot;.equals(dealUser)">
-                and deal_user = #{dealUser}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="imageName != null and !&quot;&quot;.equals(imageName)">
-                and image_name = #{imageName}
-            </if>
-            <if test="downloadFlag != null and !&quot;&quot;.equals(downloadFlag)">
-                and download_flag = #{downloadFlag}
-            </if>
-            <if test="cleanFlag != null and !&quot;&quot;.equals(cleanFlag)">
-                and clean_flag = #{cleanFlag}
-            </if>
-
-        </where>
-        GROUP BY
-        store_id
-    </select>
-    <update id="delete">
-        UPDATE order_image SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
-        select
-        <include refid="Base_Column_List"/>
-        from order_image
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-
-    <select id="queryAutoCleanOrderImage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderImage">
-        select
-        <include refid="Base_Column_List"/>
-        from order_image
-        <where>
-            and del_flag = 'N'
-            and download_flag = 'Y'
-            and clean_flag = 'N'
-            and order_id in (
-            SELECT
-            id
-            FROM
-            user_order
-            WHERE
-            del_flag = 'N'
-            AND status_flag >= 5
-            <![CDATA[AND confirm_time < DATE_ADD(NOW(), INTERVAL - (SELECT extra FROM system_config WHERE id=1) DAY)]]>
-            )
-            <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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-        </where>
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/OrderInvoiceMapper.java

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

+ 0 - 461
src/main/java/com/izouma/awesomeadmin/dao/OrderInvoiceMapper.xml

@@ -1,461 +0,0 @@
-<?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.OrderInvoiceMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderInvoice" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
-                                <result column="order_id" property="orderId" jdbcType="VARCHAR" />
-                                <result column="store_id" property="storeId" jdbcType="VARCHAR" />
-                                <result column="invoice_no" property="invoiceNo" jdbcType="VARCHAR" />
-                                <result column="image" property="image" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="type_flag" property="typeFlag" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            order_id,
-
-            store_id,
-
-            invoice_no,
-
-            image,
-
-            remark,
-
-            type_flag,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from order_invoice
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from order_invoice
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderInvoice" useGeneratedKeys="true" keyProperty="id">
-        insert into order_invoice
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="updateTime!= null" >
-                update_time,
-            </if>
-                <if test="updateUser!= null" >
-                update_user,
-            </if>
-                <if test="createTime!= null" >
-                create_time,
-            </if>
-                <if test="createUser!= null" >
-                create_user,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="orderId!= null" >
-                order_id,
-            </if>
-                <if test="storeId!= null" >
-                store_id,
-            </if>
-                <if test="invoiceNo!= null" >
-                invoice_no,
-            </if>
-                <if test="image!= null" >
-                image,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="typeFlag!= null" >
-                type_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="userId != null" >
-                #{userId,jdbcType=VARCHAR},
-            </if>
-                    <if test="orderId != null" >
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-                    <if test="storeId != null" >
-                #{storeId,jdbcType=VARCHAR},
-            </if>
-                    <if test="invoiceNo != null" >
-                #{invoiceNo,jdbcType=VARCHAR},
-            </if>
-                    <if test="image != null" >
-                #{image,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="typeFlag != null" >
-                #{typeFlag,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderInvoice" >
-        update order_invoice
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-                     <if test="orderId != null" >
-               order_id= #{orderId,jdbcType=VARCHAR},
-            </if>
-                     <if test="storeId != null" >
-               store_id= #{storeId,jdbcType=VARCHAR},
-            </if>
-                     <if test="invoiceNo != null" >
-               invoice_no= #{invoiceNo,jdbcType=VARCHAR},
-            </if>
-                     <if test="image != null" >
-               image= #{image,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryOrderInvoiceByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderInvoice">
-        select <include refid="Base_Column_List"/> from order_invoice
-        <where>
-            and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
-            </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
-            </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
-            </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
-            </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
-            </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
-            </if>
-                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and  user_id = #{record.userId}
-            </if>
-                     <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
-                and  order_id = #{record.orderId}
-            </if>
-                     <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and  store_id = #{record.storeId}
-            </if>
-                     <if test="record.invoiceNo != null and !&quot;&quot;.equals(record.invoiceNo)">
-                and  invoice_no = #{record.invoiceNo}
-            </if>
-                     <if test="record.image != null and !&quot;&quot;.equals(record.image)">
-                and  image = #{record.image}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  order_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  store_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  invoice_no LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                                                                     OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_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="queryAllOrderInvoice" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderInvoice">
-        select <include refid="Base_Column_List"/> from order_invoice
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
-            </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
-            </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
-            </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
-            </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
-            </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
-            </if>
-                    <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and  user_id = #{userId}
-            </if>
-                    <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-                and  order_id = #{orderId}
-            </if>
-                    <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and  store_id = #{storeId}
-            </if>
-                    <if test="invoiceNo != null and !&quot;&quot;.equals(invoiceNo)">
-                and  invoice_no = #{invoiceNo}
-            </if>
-                    <if test="image != null and !&quot;&quot;.equals(image)">
-                and  image = #{image}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  order_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  store_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  invoice_no LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_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="queryOrderInvoice" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderInvoice">
-        select <include refid="Base_Column_List"/> from order_invoice
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-                     <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-                     <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-                and order_id = #{orderId}
-            </if>
-                     <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-                     <if test="invoiceNo != null and !&quot;&quot;.equals(invoiceNo)">
-                and invoice_no = #{invoiceNo}
-            </if>
-                     <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE order_invoice SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderInvoice">
-        select <include refid="Base_Column_List"/> from order_invoice
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/OrderLogisticsMapper.java

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

+ 0 - 459
src/main/java/com/izouma/awesomeadmin/dao/OrderLogisticsMapper.xml

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

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/OrderMessageMapper.java

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

+ 0 - 440
src/main/java/com/izouma/awesomeadmin/dao/OrderMessageMapper.xml

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

+ 0 - 35
src/main/java/com/izouma/awesomeadmin/dao/OrderRepairDetailMapper.java

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

+ 0 - 395
src/main/java/com/izouma/awesomeadmin/dao/OrderRepairDetailMapper.xml

@@ -1,395 +0,0 @@
-<?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.OrderRepairDetailMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        <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="repair_id" property="repairId" jdbcType="VARCHAR"/>
-        <result column="image_id" property="imageId" jdbcType="VARCHAR"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            repair_id,
-
-            image_id,
-
-            remark,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair_detail
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from order_repair_detail
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderRepairDetail" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into order_repair_detail
-        <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="repairId!= null">
-                repair_id,
-            </if>
-            <if test="imageId!= null">
-                image_id,
-            </if>
-            <if test="remark!= null">
-                remark,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="repairId != null">
-                #{repairId,jdbcType=VARCHAR},
-            </if>
-            <if test="imageId != null">
-                #{imageId,jdbcType=VARCHAR},
-            </if>
-            <if test="remark != null">
-                #{remark,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        update order_repair_detail
-        <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="repairId != null">
-                repair_id= #{repairId,jdbcType=VARCHAR},
-            </if>
-            <if test="imageId != null">
-                image_id= #{imageId,jdbcType=VARCHAR},
-            </if>
-            <if test="remark != null">
-                remark= #{remark,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryOrderRepairDetailByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair_detail
-        <where>
-            and del_flag = 'N'
-            <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.repairId != null and !&quot;&quot;.equals(record.repairId)">
-                and repair_id = #{record.repairId}
-            </if>
-            <if test="record.imageId != null and !&quot;&quot;.equals(record.imageId)">
-                and image_id = #{record.imageId}
-            </if>
-            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and remark = #{record.remark}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR repair_id LIKE concat('%',#{record.searchKey},'%')
-                    OR image_id LIKE concat('%',#{record.searchKey},'%')
-                    OR remark LIKE concat('%',#{record.searchKey},'%')
-                </trim>
-            </if>
-
-            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
-                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-
-        </where>
-        order by
-
-        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-        id desc
-    </select>
-    <select id="queryAllOrderRepairDetail" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair_detail
-        <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="repairId != null and !&quot;&quot;.equals(repairId)">
-                and repair_id = #{repairId}
-            </if>
-            <if test="imageId != null and !&quot;&quot;.equals(imageId)">
-                and image_id = #{imageId}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR repair_id LIKE concat('%',#{searchKey},'%')
-                    OR image_id LIKE concat('%',#{searchKey},'%')
-                    OR remark LIKE concat('%',#{searchKey},'%')
-                </trim>
-            </if>
-            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-        </where>
-        order by
-
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-
-        id desc
-    </select>
-    <select id="queryOrderRepairDetail" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair_detail
-        <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="repairId != null and !&quot;&quot;.equals(repairId)">
-                and repair_id = #{repairId}
-            </if>
-            <if test="imageId != null and !&quot;&quot;.equals(imageId)">
-                and image_id = #{imageId}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE order_repair_detail SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair_detail
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-    <select id="queryAllOrderRepairDetailExportRemark" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        SELECT
-            order_repair_detail.*, order_image.image_name
-        FROM
-            order_repair_detail
-        LEFT JOIN order_image ON order_image.del_flag = 'N'
-        AND order_repair_detail.image_id = order_image.id
-        WHERE
-            order_repair_detail.del_flag = 'N'
-        AND repair_id = #{repairId}
-    </select>
-</mapper>
-

+ 0 - 36
src/main/java/com/izouma/awesomeadmin/dao/OrderRepairMapper.java

@@ -1,36 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import java.util.*;
-
-import com.izouma.awesomeadmin.datasource.DataSource;
-import org.springframework.stereotype.Repository;
-import com.izouma.awesomeadmin.model.OrderRepair;
-
-
-/**
- * Dao接口
- */
-@Repository("com.zoumaframe.dao.OrderRepairMapper")
-public interface OrderRepairMapper {
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insertSelective(OrderRepair record);
-
-    OrderRepair selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(OrderRepair record);
-
-    List<OrderRepair> queryAllOrderRepair(OrderRepair record);
-
-    List<OrderRepair> queryOrderRepairByPage(Map<String, Object> parameter);
-
-    int delete(String id);
-
-    OrderRepair queryOrderRepair(OrderRepair record);
-
-    List<OrderRepair> query(OrderRepair record);
-
-    int repairByOrderId(OrderRepair orderRepair);
-}
-

+ 0 - 465
src/main/java/com/izouma/awesomeadmin/dao/OrderRepairMapper.xml

@@ -1,465 +0,0 @@
-<?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.OrderRepairMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderRepair">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="VARCHAR"/>
-        <result column="order_id" property="orderId" jdbcType="VARCHAR"/>
-        <result column="store_id" property="storeId" jdbcType="VARCHAR"/>
-        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            order_id,
-
-            store_id,
-
-            status_flag,
-
-            remark,
-
-            type_flag,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from order_repair
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderRepair" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into order_repair
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!= null">
-                id,
-            </if>
-            <if test="delFlag!= null">
-                del_flag,
-            </if>
-            <if test="updateTime!= null">
-                update_time,
-            </if>
-            <if test="updateUser!= null">
-                update_user,
-            </if>
-            <if test="createTime!= null">
-                create_time,
-            </if>
-            <if test="createUser!= null">
-                create_user,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="orderId!= null">
-                order_id,
-            </if>
-            <if test="storeId!= null">
-                store_id,
-            </if>
-            <if test="statusFlag!= null">
-                status_flag,
-            </if>
-            <if test="remark!= null">
-                remark,
-            </if>
-            <if test="typeFlag!= null">
-                type_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="userId != null">
-                #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="orderId != null">
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="remark != null">
-                #{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderRepair">
-        update order_repair
-        <set>
-            <if test="id != null">
-                id= #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="orderId != null">
-                order_id= #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                store_id= #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="remark != null">
-                remark= #{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryOrderRepairByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderRepair">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair
-        <where>
-            and del_flag = 'N'
-            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and id = #{record.id}
-            </if>
-            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and del_flag = #{record.delFlag}
-            </if>
-            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and update_time = #{record.updateTime}
-            </if>
-            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and update_user = #{record.updateUser}
-            </if>
-            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and create_time = #{record.createTime}
-            </if>
-            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and create_user = #{record.createUser}
-            </if>
-            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and user_id = #{record.userId}
-            </if>
-            <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
-                and order_id = #{record.orderId}
-            </if>
-            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and store_id = #{record.storeId}
-            </if>
-            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and status_flag = #{record.statusFlag}
-            </if>
-            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and remark = #{record.remark}
-            </if>
-            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR order_id LIKE concat('%',#{record.searchKey},'%')
-                    OR store_id LIKE concat('%',#{record.searchKey},'%')
-                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR remark LIKE concat('%',#{record.searchKey},'%')
-                    OR type_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>
-        type_flag, id desc
-    </select>
-    <select id="queryAllOrderRepair" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.OrderRepair">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-                and order_id = #{orderId}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR order_id LIKE concat('%',#{searchKey},'%')
-                    OR store_id LIKE concat('%',#{searchKey},'%')
-                    OR status_flag LIKE concat('%',#{searchKey},'%')
-                    OR remark LIKE concat('%',#{searchKey},'%')
-                    OR type_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>
-
-        type_flag, id desc
-    </select>
-    <select id="queryOrderRepair" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepair">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
-                and order_id = #{orderId}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE order_repair SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <update id="repairByOrderId">
-        UPDATE order_repair
-            SET status_flag = CASE
-            WHEN status_flag = 2 THEN
-                3
-            WHEN status_flag = 0 THEN
-                1
-            ELSE
-                status_flag
-            END
-        WHERE
-            del_flag = 'N'
-            AND order_id = #{orderId}
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepair">
-        select
-        <include refid="Base_Column_List"/>
-        from order_repair
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/PersonalAuthenticationMapper.java

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

+ 0 - 505
src/main/java/com/izouma/awesomeadmin/dao/PersonalAuthenticationMapper.xml

@@ -1,505 +0,0 @@
-<?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.PersonalAuthenticationMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.PersonalAuthentication" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="user_id" property="userId" jdbcType="INTEGER" />
-                                <result column="user_name" property="userName" jdbcType="VARCHAR" />
-                                <result column="real_name" property="realName" jdbcType="VARCHAR" />
-                                <result column="idcard" property="idcard" jdbcType="VARCHAR" />
-                                <result column="face_image" property="faceImage" jdbcType="VARCHAR" />
-                                <result column="back_image" property="backImage" jdbcType="VARCHAR" />
-                                <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
-                                <result column="telephone" property="telephone" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            user_name,
-
-            real_name,
-
-            idcard,
-
-            face_image,
-
-            back_image,
-
-            status_flag,
-
-            telephone,
-
-            remark,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from personal_authentication
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from personal_authentication
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.PersonalAuthentication" useGeneratedKeys="true" keyProperty="id">
-        insert into personal_authentication
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="updateTime!= null" >
-                update_time,
-            </if>
-                <if test="updateUser!= null" >
-                update_user,
-            </if>
-                <if test="createTime!= null" >
-                create_time,
-            </if>
-                <if test="createUser!= null" >
-                create_user,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="userName!= null" >
-                user_name,
-            </if>
-                <if test="realName!= null" >
-                real_name,
-            </if>
-                <if test="idcard!= null" >
-                idcard,
-            </if>
-                <if test="faceImage!= null" >
-                face_image,
-            </if>
-                <if test="backImage!= null" >
-                back_image,
-            </if>
-                <if test="statusFlag!= null" >
-                status_flag,
-            </if>
-                <if test="telephone!= null" >
-                telephone,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
-                #{id,jdbcType=INTEGER},
-            </if>
-                    <if test="delFlag != null" >
-                #{delFlag,jdbcType=CHAR},
-            </if>
-                    <if test="updateTime != null" >
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="updateUser != null" >
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="createTime != null" >
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="createUser != null" >
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=INTEGER},
-            </if>
-                    <if test="userName != null" >
-                #{userName,jdbcType=VARCHAR},
-            </if>
-                    <if test="realName != null" >
-                #{realName,jdbcType=VARCHAR},
-            </if>
-                    <if test="idcard != null" >
-                #{idcard,jdbcType=VARCHAR},
-            </if>
-                    <if test="faceImage != null" >
-                #{faceImage,jdbcType=VARCHAR},
-            </if>
-                    <if test="backImage != null" >
-                #{backImage,jdbcType=VARCHAR},
-            </if>
-                    <if test="statusFlag != null" >
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-                    <if test="telephone != null" >
-                #{telephone,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.PersonalAuthentication" >
-        update personal_authentication
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=INTEGER},
-            </if>
-                     <if test="userName != null" >
-               user_name= #{userName,jdbcType=VARCHAR},
-            </if>
-                     <if test="realName != null" >
-               real_name= #{realName,jdbcType=VARCHAR},
-            </if>
-                     <if test="idcard != null" >
-               idcard= #{idcard,jdbcType=VARCHAR},
-            </if>
-                     <if test="faceImage != null" >
-               face_image= #{faceImage,jdbcType=VARCHAR},
-            </if>
-                     <if test="backImage != null" >
-               back_image= #{backImage,jdbcType=VARCHAR},
-            </if>
-                     <if test="statusFlag != null" >
-               status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-                     <if test="telephone != null" >
-               telephone= #{telephone,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryPersonalAuthenticationByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PersonalAuthentication">
-        select <include refid="Base_Column_List"/> from personal_authentication
-        <where>
-            and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
-            </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
-            </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
-            </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
-            </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
-            </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
-            </if>
-                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and  user_id = #{record.userId}
-            </if>
-                     <if test="record.userName != null and !&quot;&quot;.equals(record.userName)">
-                and  user_name = #{record.userName}
-            </if>
-                     <if test="record.realName != null and !&quot;&quot;.equals(record.realName)">
-                and  real_name = #{record.realName}
-            </if>
-                     <if test="record.idcard != null and !&quot;&quot;.equals(record.idcard)">
-                and  idcard = #{record.idcard}
-            </if>
-                     <if test="record.faceImage != null and !&quot;&quot;.equals(record.faceImage)">
-                and  face_image = #{record.faceImage}
-            </if>
-                     <if test="record.backImage != null and !&quot;&quot;.equals(record.backImage)">
-                and  back_image = #{record.backImage}
-            </if>
-                     <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and  status_flag = #{record.statusFlag}
-            </if>
-                     <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
-                and  telephone = #{record.telephone}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  real_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  idcard LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                                                                                                                                      OR  status_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  telephone LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
-
-            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
-                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-
-        </where>
-        order by
-
-        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-        status_flag , id desc
-    </select>
-    <select id="queryAllPersonalAuthentication" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PersonalAuthentication">
-        select <include refid="Base_Column_List"/> from personal_authentication
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
-            </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
-            </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
-            </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
-            </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
-            </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
-            </if>
-                    <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and  user_id = #{userId}
-            </if>
-                    <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and  user_name = #{userName}
-            </if>
-                    <if test="realName != null and !&quot;&quot;.equals(realName)">
-                and  real_name = #{realName}
-            </if>
-                    <if test="idcard != null and !&quot;&quot;.equals(idcard)">
-                and  idcard = #{idcard}
-            </if>
-                    <if test="faceImage != null and !&quot;&quot;.equals(faceImage)">
-                and  face_image = #{faceImage}
-            </if>
-                    <if test="backImage != null and !&quot;&quot;.equals(backImage)">
-                and  back_image = #{backImage}
-            </if>
-                    <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and  status_flag = #{statusFlag}
-            </if>
-                    <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and  telephone = #{telephone}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  real_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  idcard LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                                                                                                                                                                                        OR  status_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  telephone LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
-            </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
-
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
-
-                </foreach>
-            </otherwise>
-        </choose>
-
-
-    </foreach>
-
-
-</if>
-        </where>
-        order by
-
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-
-        status_flag ,id desc
-    </select>
-    <select id="queryPersonalAuthentication" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PersonalAuthentication">
-        select <include refid="Base_Column_List"/> from personal_authentication
-        <where>
-            and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-                     <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-                     <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and user_name = #{userName}
-            </if>
-                     <if test="realName != null and !&quot;&quot;.equals(realName)">
-                and real_name = #{realName}
-            </if>
-                     <if test="idcard != null and !&quot;&quot;.equals(idcard)">
-                and idcard = #{idcard}
-            </if>
-                     <if test="faceImage != null and !&quot;&quot;.equals(faceImage)">
-                and face_image = #{faceImage}
-            </if>
-                     <if test="backImage != null and !&quot;&quot;.equals(backImage)">
-                and back_image = #{backImage}
-            </if>
-                     <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-                     <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE personal_authentication SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PersonalAuthentication">
-        select <include refid="Base_Column_List"/> from personal_authentication
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ProductCollectionMapper.java

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

+ 0 - 394
src/main/java/com/izouma/awesomeadmin/dao/ProductCollectionMapper.xml

@@ -1,394 +0,0 @@
-<?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.ProductCollectionMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductCollection">
-        <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="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-        <result column="user_id" property="userId" jdbcType="VARCHAR"/>
-        <result column="target_id" property="targetId" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            type_flag,
-
-            user_id,
-
-            target_id,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from product_collection
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from product_collection
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductCollection" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into product_collection
-        <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="typeFlag!= null">
-                type_flag,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="targetId!= null">
-                target_id,
-            </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="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="targetId != null">
-                #{targetId,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductCollection">
-        update product_collection
-        <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="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="userId != null">
-                user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="targetId != null">
-                target_id= #{targetId,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryProductCollectionByPage" parameterType="java.util.Map"
-            resultMap="AllInfoForList">
-        select
-        <include refid="Base_Column_List"/>
-        from product_collection
-        <where>
-            and del_flag = 'N'
-            <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.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and user_id = #{record.userId}
-            </if>
-            <if test="record.targetId != null and !&quot;&quot;.equals(record.targetId)">
-                and target_id = #{record.targetId}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR target_id 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="queryAllProductCollection" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductCollection">
-        select
-        <include refid="Base_Column_List"/>
-        from product_collection
-        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="targetId != null and !&quot;&quot;.equals(targetId)">
-                and target_id = #{targetId}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR type_flag LIKE concat('%',#{searchKey},'%')
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR target_id 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="queryProductCollection" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductCollection">
-        select
-        <include refid="Base_Column_List"/>
-        from product_collection
-        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="targetId != null and !&quot;&quot;.equals(targetId)">
-                and target_id = #{targetId}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE product_collection SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductCollection">
-        select
-        <include refid="Base_Column_List"/>
-        from product_collection
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-
-    <resultMap id="AllInfoForList" type="com.izouma.awesomeadmin.model.ProductCollection" extends="BaseResultMap">
-
-
-        <association property="productInfo"
-                     javaType="com.izouma.awesomeadmin.model.ProductInfo"
-                     select="com.izouma.awesomeadmin.dao.ProductInfoMapper.queryProductInfo"
-                     column="{ id = target_id }"/>
-
-    </resultMap>
-
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ProductCommentImageMapper.java

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

+ 0 - 463
src/main/java/com/izouma/awesomeadmin/dao/ProductCommentImageMapper.xml

@@ -1,463 +0,0 @@
-<?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.ProductCommentImageMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductCommentImage" >
-                <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="product_id" property="productId" jdbcType="VARCHAR" />
-                                <result column="order_id" property="orderId" jdbcType="VARCHAR" />
-                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
-                                <result column="store_id" property="storeId" jdbcType="VARCHAR" />
-                                <result column="comment_id" property="commentId" jdbcType="VARCHAR" />
-                                <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
-                                <result column="image_size" property="imageSize" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            product_id,
-
-            order_id,
-
-            user_id,
-
-            store_id,
-
-            comment_id,
-
-            image_url,
-
-            image_size,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from product_comment_image
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from product_comment_image
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductCommentImage" useGeneratedKeys="true" keyProperty="id">
-        insert into product_comment_image
-        <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="productId!= null" >
-                product_id,
-            </if>
-                <if test="orderId!= null" >
-                order_id,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="storeId!= null" >
-                store_id,
-            </if>
-                <if test="commentId!= null" >
-                comment_id,
-            </if>
-                <if test="imageUrl!= null" >
-                image_url,
-            </if>
-                <if test="imageSize!= null" >
-                image_size,
-            </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="productId != null" >
-                #{productId,jdbcType=VARCHAR},
-            </if>
-                    <if test="orderId != null" >
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=VARCHAR},
-            </if>
-                    <if test="storeId != null" >
-                #{storeId,jdbcType=VARCHAR},
-            </if>
-                    <if test="commentId != null" >
-                #{commentId,jdbcType=VARCHAR},
-            </if>
-                    <if test="imageUrl != null" >
-                #{imageUrl,jdbcType=VARCHAR},
-            </if>
-                    <if test="imageSize != null" >
-                #{imageSize,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductCommentImage" >
-        update product_comment_image
-        <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="productId != null" >
-               product_id= #{productId,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="storeId != null" >
-               store_id= #{storeId,jdbcType=VARCHAR},
-            </if>
-                     <if test="commentId != null" >
-               comment_id= #{commentId,jdbcType=VARCHAR},
-            </if>
-                     <if test="imageUrl != null" >
-               image_url= #{imageUrl,jdbcType=VARCHAR},
-            </if>
-                     <if test="imageSize != null" >
-               image_size= #{imageSize,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryProductCommentImageByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductCommentImage">
-        select <include refid="Base_Column_List"/> from product_comment_image
-        <where>
-            and del_flag = 'N'
-                    <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.productId != null and !&quot;&quot;.equals(record.productId)">
-                and  product_id = #{record.productId}
-            </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.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and  store_id = #{record.storeId}
-            </if>
-                     <if test="record.commentId != null and !&quot;&quot;.equals(record.commentId)">
-                and  comment_id = #{record.commentId}
-            </if>
-                     <if test="record.imageUrl != null and !&quot;&quot;.equals(record.imageUrl)">
-                and  image_url = #{record.imageUrl}
-            </if>
-                     <if test="record.imageSize != null and !&quot;&quot;.equals(record.imageSize)">
-                and  image_size = #{record.imageSize}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  product_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  order_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  store_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  comment_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image_url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image_size 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="queryAllProductCommentImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductCommentImage">
-        select <include refid="Base_Column_List"/> from product_comment_image
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and  product_id = #{productId}
-            </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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and  store_id = #{storeId}
-            </if>
-                    <if test="commentId != null and !&quot;&quot;.equals(commentId)">
-                and  comment_id = #{commentId}
-            </if>
-                    <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and  image_url = #{imageUrl}
-            </if>
-                    <if test="imageSize != null and !&quot;&quot;.equals(imageSize)">
-                and  image_size = #{imageSize}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  product_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  order_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  store_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  comment_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image_url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image_size 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="queryProductCommentImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductCommentImage">
-        select <include refid="Base_Column_List"/> from product_comment_image
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-                     <if test="commentId != null and !&quot;&quot;.equals(commentId)">
-                and comment_id = #{commentId}
-            </if>
-                     <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and image_url = #{imageUrl}
-            </if>
-                     <if test="imageSize != null and !&quot;&quot;.equals(imageSize)">
-                and image_size = #{imageSize}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE product_comment_image SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductCommentImage">
-        select <include refid="Base_Column_List"/> from product_comment_image
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 36
src/main/java/com/izouma/awesomeadmin/dao/ProductCommentMapper.java

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

+ 0 - 580
src/main/java/com/izouma/awesomeadmin/dao/ProductCommentMapper.xml

@@ -1,580 +0,0 @@
-<?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.ProductCommentMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductComment">
-        <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="product_id" property="productId" jdbcType="VARCHAR"/>
-        <result column="order_id" property="orderId" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="VARCHAR"/>
-        <result column="store_id" property="storeId" jdbcType="VARCHAR"/>
-        <result column="context" property="context" jdbcType="VARCHAR"/>
-        <result column="star_level" property="starLevel" jdbcType="VARCHAR"/>
-        <result column="anonymous" property="anonymous" jdbcType="CHAR"/>
-        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            product_id,
-
-            order_id,
-
-            user_id,
-
-            store_id,
-
-            context,
-
-            star_level,
-
-            anonymous,
-
-            type_flag,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from product_comment
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from product_comment
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductComment" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into product_comment
-        <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="productId!= null">
-                product_id,
-            </if>
-            <if test="orderId!= null">
-                order_id,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="storeId!= null">
-                store_id,
-            </if>
-            <if test="context!= null">
-                context,
-            </if>
-            <if test="starLevel!= null">
-                star_level,
-            </if>
-            <if test="anonymous!= null">
-                anonymous,
-            </if>
-            <if test="typeFlag!= null">
-                type_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="productId != null">
-                #{productId,jdbcType=VARCHAR},
-            </if>
-            <if test="orderId != null">
-                #{orderId,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="context != null">
-                #{context,jdbcType=VARCHAR},
-            </if>
-            <if test="starLevel != null">
-                #{starLevel,jdbcType=VARCHAR},
-            </if>
-            <if test="anonymous != null">
-                #{anonymous,jdbcType=CHAR},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductComment">
-        update product_comment
-        <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="productId != null">
-                product_id= #{productId,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="storeId != null">
-                store_id= #{storeId,jdbcType=VARCHAR},
-            </if>
-            <if test="context != null">
-                context= #{context,jdbcType=VARCHAR},
-            </if>
-            <if test="starLevel != null">
-                star_level= #{starLevel,jdbcType=VARCHAR},
-            </if>
-            <if test="anonymous != null">
-                anonymous= #{anonymous,jdbcType=CHAR},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryProductCommentByPage" parameterType="java.util.Map"
-            resultMap="AllInfoForGetList">
-        select
-        <include refid="Base_Column_List"/>
-        from product_comment
-        <where>
-            and del_flag = 'N'
-            <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.productId != null and !&quot;&quot;.equals(record.productId)">
-                and product_id = #{record.productId}
-            </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.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and store_id = #{record.storeId}
-            </if>
-            <if test="record.context != null and !&quot;&quot;.equals(record.context)">
-                and context = #{record.context}
-            </if>
-            <if test="record.starLevel != null and !&quot;&quot;.equals(record.starLevel)">
-                and star_level = #{record.starLevel}
-            </if>
-            <if test="record.anonymous != null and !&quot;&quot;.equals(record.anonymous)">
-                and anonymous = #{record.anonymous}
-            </if>
-            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR product_id LIKE concat('%',#{record.searchKey},'%')
-                    OR order_id LIKE concat('%',#{record.searchKey},'%')
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR store_id LIKE concat('%',#{record.searchKey},'%')
-                    OR context LIKE concat('%',#{record.searchKey},'%')
-                    OR star_level LIKE concat('%',#{record.searchKey},'%')
-                    OR anonymous LIKE concat('%',#{record.searchKey},'%')
-                    OR type_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="queryAllProductComment" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductComment">
-        select
-        <include refid="Base_Column_List"/>
-        from product_comment
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="context != null and !&quot;&quot;.equals(context)">
-                and context = #{context}
-            </if>
-            <if test="starLevel != null and !&quot;&quot;.equals(starLevel)">
-                and star_level = #{starLevel}
-            </if>
-            <if test="anonymous != null and !&quot;&quot;.equals(anonymous)">
-                and anonymous = #{anonymous}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR product_id LIKE concat('%',#{searchKey},'%')
-                    OR order_id LIKE concat('%',#{searchKey},'%')
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR store_id LIKE concat('%',#{searchKey},'%')
-                    OR context LIKE concat('%',#{searchKey},'%')
-                    OR star_level LIKE concat('%',#{searchKey},'%')
-                    OR anonymous LIKE concat('%',#{searchKey},'%')
-                    OR type_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="queryProductComment" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductComment">
-        select
-        <include refid="Base_Column_List"/>
-        from product_comment
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </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="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="context != null and !&quot;&quot;.equals(context)">
-                and context = #{context}
-            </if>
-            <if test="starLevel != null and !&quot;&quot;.equals(starLevel)">
-                and star_level = #{starLevel}
-            </if>
-            <if test="anonymous != null and !&quot;&quot;.equals(anonymous)">
-                and anonymous = #{anonymous}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <select id="getCount" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductComment">
-        select count(1) commentCount, AVG(star_level) AS star_level from product_comment
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </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}
-                and type_flag = 1
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="context != null and !&quot;&quot;.equals(context)">
-                and context = #{context}
-            </if>
-            <if test="starLevel != null and !&quot;&quot;.equals(starLevel)">
-                and star_level = #{starLevel}
-            </if>
-            <if test="anonymous != null and !&quot;&quot;.equals(anonymous)">
-                and anonymous = #{anonymous}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE product_comment SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductComment">
-        select
-        <include refid="Base_Column_List"/>
-        from product_comment
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-
-    <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.ProductComment" extends="BaseResultMap">
-
-
-        <collection property="productCommentImageList"
-                    ofType="com.izouma.awesomeadmin.model.ProductCommentImage"
-                    select="com.izouma.awesomeadmin.dao.ProductCommentImageMapper.queryAllProductCommentImage"
-                    column="{ productId = id }"/>
-
-    </resultMap>
-
-    <resultMap id="AllInfoForGetList" type="com.izouma.awesomeadmin.model.ProductComment" extends="BaseResultMap">
-
-
-        <association property="userInfo"
-                     javaType="com.izouma.awesomeadmin.model.UserInfo"
-                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo"
-                     column="{ id = user_id }"/>
-
-        <association property="productInfo"
-                     javaType="com.izouma.awesomeadmin.model.ProductInfo"
-                     select="com.izouma.awesomeadmin.dao.ProductInfoMapper.queryProductInfo"
-                     column="{ id = product_id }"/>
-
-        <collection property="productCommentImageList"
-                    ofType="com.izouma.awesomeadmin.model.ProductCommentImage"
-                    select="com.izouma.awesomeadmin.dao.ProductCommentImageMapper.queryAllProductCommentImage"
-                    column="{ commentId = id }"/>
-
-    </resultMap>
-
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ProductImageMapper.java

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

+ 0 - 415
src/main/java/com/izouma/awesomeadmin/dao/ProductImageMapper.xml

@@ -1,415 +0,0 @@
-<?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.ProductImageMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductImage" >
-                <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="product_id" property="productId" jdbcType="VARCHAR" />
-                                <result column="image" property="image" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-                                <result column="name" property="name" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            product_id,
-
-            image,
-
-            remark,
-
-            rank,
-
-            name,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from product_image
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from product_image
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductImage" useGeneratedKeys="true" keyProperty="id">
-        insert into product_image
-        <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="productId!= null" >
-                product_id,
-            </if>
-                <if test="image!= null" >
-                image,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </if>
-                <if test="name!= null" >
-                name,
-            </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="productId != null" >
-                #{productId,jdbcType=VARCHAR},
-            </if>
-                    <if test="image != null" >
-                #{image,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                    <if test="name != null" >
-                #{name,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductImage" >
-        update product_image
-        <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="productId != null" >
-               product_id= #{productId,jdbcType=VARCHAR},
-            </if>
-                     <if test="image != null" >
-               image= #{image,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </if>
-                     <if test="name != null" >
-               name= #{name,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryProductImageByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductImage">
-        select <include refid="Base_Column_List"/> from product_image
-        <where>
-            and del_flag = 'N'
-                    <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.productId != null and !&quot;&quot;.equals(record.productId)">
-                and  product_id = #{record.productId}
-            </if>
-                     <if test="record.image != null and !&quot;&quot;.equals(record.image)">
-                and  image = #{record.image}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                     <if test="record.name != null and !&quot;&quot;.equals(record.name)">
-                and  name = #{record.name}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  product_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                                                                     OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name 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>
-        rank desc, id
-    </select>
-    <select id="queryAllProductImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductImage">
-        select <include refid="Base_Column_List"/> from product_image
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and  product_id = #{productId}
-            </if>
-                    <if test="image != null and !&quot;&quot;.equals(image)">
-                and  image = #{image}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="name != null and !&quot;&quot;.equals(name)">
-                and  name = #{name}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  product_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name 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>
-
-        rank desc,id
-    </select>
-    <select id="queryProductImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductImage">
-        select <include refid="Base_Column_List"/> from product_image
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </if>
-                     <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-                     <if test="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE product_image SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductImage">
-        select <include refid="Base_Column_List"/> from product_image
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 34
src/main/java/com/izouma/awesomeadmin/dao/ProductInfoMapper.java

@@ -1,34 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import com.izouma.awesomeadmin.model.ProductInfo;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
-*  Dao接口
-*/
-@Repository("com.zoumaframe.dao.ProductInfoMapper")
-public interface ProductInfoMapper{
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insertSelective(ProductInfo record);
-
-    ProductInfo selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(ProductInfo record);
-
-    List<ProductInfo> queryAllProductInfo(ProductInfo record);
-
-    List<ProductInfo> queryProductInfoByPage(Map<String, Object> parameter);
-
-    int delete(String id);
-
-    ProductInfo queryProductInfo(ProductInfo record);
-
-    List<ProductInfo> query(ProductInfo record);
-}
-

+ 0 - 687
src/main/java/com/izouma/awesomeadmin/dao/ProductInfoMapper.xml

@@ -1,687 +0,0 @@
-<?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.ProductInfoMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductInfo">
-        <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="service_type" property="serviceType" jdbcType="VARCHAR"/>
-        <result column="subclass" property="subclass" jdbcType="VARCHAR"/>
-        <result column="title" property="title" jdbcType="VARCHAR"/>
-        <result column="image" property="image" jdbcType="VARCHAR"/>
-        <result column="service_detail" property="serviceDetail" jdbcType="VARCHAR"/>
-        <result column="inventory" property="inventory" jdbcType="INTEGER"/>
-        <result column="on_shelf" property="onShelf" jdbcType="CHAR"/>
-        <result column="use_flag" property="useFlag" jdbcType="CHAR"/>
-        <result column="hot_flag" property="hotFlag" jdbcType="INTEGER"/>
-        <result column="home_flag" property="homeFlag" jdbcType="INTEGER"/>
-        <result column="rank" property="rank" jdbcType="INTEGER"/>
-        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
-        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-        <result column="sales_volume" property="salesVolume" jdbcType="INTEGER"/>
-        <result column="price" property="price" jdbcType="DECIMAL"/>
-        <result column="product_detail" property="productDetail" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            service_type,
-
-            subclass,
-
-            title,
-
-            image,
-
-            service_detail,
-
-            inventory,
-
-            on_shelf,
-
-            use_flag,
-
-            hot_flag,
-
-            home_flag,
-
-            rank,
-
-            store_id,
-
-            type_flag,
-
-            sales_volume,
-
-            price,
-
-            product_detail,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from product_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from product_info
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductInfo" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into product_info
-        <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="serviceType!= null">
-                service_type,
-            </if>
-            <if test="subclass!= null">
-                subclass,
-            </if>
-            <if test="title!= null">
-                title,
-            </if>
-            <if test="image!= null">
-                image,
-            </if>
-            <if test="serviceDetail!= null">
-                service_detail,
-            </if>
-            <if test="inventory!= null">
-                inventory,
-            </if>
-            <if test="onShelf!= null">
-                on_shelf,
-            </if>
-            <if test="useFlag!= null">
-                use_flag,
-            </if>
-            <if test="hotFlag!= null">
-                hot_flag,
-            </if>
-            <if test="homeFlag!= null">
-                home_flag,
-            </if>
-            <if test="rank!= null">
-                rank,
-            </if>
-            <if test="storeId!= null">
-                store_id,
-            </if>
-            <if test="typeFlag!= null">
-                type_flag,
-            </if>
-            <if test="salesVolume!= null">
-                sales_volume,
-            </if>
-            <if test="price!= null">
-                price,
-            </if>
-            <if test="productDetail!= null">
-                product_detail,
-            </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="serviceType != null">
-                #{serviceType,jdbcType=VARCHAR},
-            </if>
-            <if test="subclass != null">
-                #{subclass,jdbcType=VARCHAR},
-            </if>
-            <if test="title != null">
-                #{title,jdbcType=VARCHAR},
-            </if>
-            <if test="image != null">
-                #{image,jdbcType=VARCHAR},
-            </if>
-            <if test="serviceDetail != null">
-                #{serviceDetail,jdbcType=VARCHAR},
-            </if>
-            <if test="inventory != null">
-                #{inventory,jdbcType=INTEGER},
-            </if>
-            <if test="onShelf != null">
-                #{onShelf,jdbcType=CHAR},
-            </if>
-            <if test="useFlag != null">
-                #{useFlag,jdbcType=CHAR},
-            </if>
-            <if test="hotFlag != null">
-                #{hotFlag,jdbcType=INTEGER},
-            </if>
-            <if test="homeFlag != null">
-                #{homeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="rank != null">
-                #{rank,jdbcType=INTEGER},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=INTEGER},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="salesVolume != null">
-                #{salesVolume,jdbcType=INTEGER},
-            </if>
-            <if test="price != null">
-                #{price,jdbcType=DECIMAL},
-            </if>
-            <if test="productDetail != null">
-                #{productDetail,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductInfo">
-        update product_info
-        <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="serviceType != null">
-                service_type= #{serviceType,jdbcType=VARCHAR},
-            </if>
-            <if test="subclass != null">
-                subclass= #{subclass,jdbcType=VARCHAR},
-            </if>
-            <if test="title != null">
-                title= #{title,jdbcType=VARCHAR},
-            </if>
-            <if test="image != null">
-                image= #{image,jdbcType=VARCHAR},
-            </if>
-            <if test="serviceDetail != null">
-                service_detail= #{serviceDetail,jdbcType=VARCHAR},
-            </if>
-            <if test="inventory != null">
-                inventory= #{inventory,jdbcType=INTEGER},
-            </if>
-            <if test="onShelf != null">
-                on_shelf= #{onShelf,jdbcType=CHAR},
-            </if>
-            <if test="useFlag != null">
-                use_flag= #{useFlag,jdbcType=CHAR},
-            </if>
-            <if test="hotFlag != null">
-                hot_flag= #{hotFlag,jdbcType=INTEGER},
-            </if>
-            <if test="homeFlag != null">
-                home_flag= #{homeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="rank != null">
-                rank= #{rank,jdbcType=INTEGER},
-            </if>
-            <if test="storeId != null">
-                store_id= #{storeId,jdbcType=INTEGER},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="salesVolume != null">
-                sales_volume= #{salesVolume,jdbcType=INTEGER},
-            </if>
-            <if test="price != null">
-                price= #{price,jdbcType=DECIMAL},
-            </if>
-            <if test="productDetail != null">
-                product_detail= #{productDetail,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where
-        <if test="id != null and !&quot;&quot;.equals(id)">
-        id = #{id,jdbcType=INTEGER}
-        </if>
-
-        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
-        id in (${idStr})
-        </if>
-
-    </update>
-    <select id="queryProductInfoByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from product_info
-        <where>
-            and del_flag = 'N'
-            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and id = #{record.id}
-            </if>
-            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
-                and id in (${record.idStr})
-            </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.serviceType != null and !&quot;&quot;.equals(record.serviceType)">
-                and service_type = #{record.serviceType}
-            </if>
-            <if test="record.subclass != null and !&quot;&quot;.equals(record.subclass)">
-                and subclass = #{record.subclass}
-            </if>
-            <if test="record.title != null and !&quot;&quot;.equals(record.title)">
-                and title = #{record.title}
-            </if>
-            <if test="record.image != null and !&quot;&quot;.equals(record.image)">
-                and image = #{record.image}
-            </if>
-            <if test="record.serviceDetail != null and !&quot;&quot;.equals(record.serviceDetail)">
-                and service_detail = #{record.serviceDetail}
-            </if>
-            <if test="record.inventory != null and !&quot;&quot;.equals(record.inventory)">
-                and inventory = #{record.inventory}
-            </if>
-            <if test="record.onShelf != null and !&quot;&quot;.equals(record.onShelf)">
-                and on_shelf = #{record.onShelf}
-            </if>
-            <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
-                and use_flag = #{record.useFlag}
-            </if>
-            <if test="record.hotFlag != null and !&quot;&quot;.equals(record.hotFlag)">
-                and hot_flag = #{record.hotFlag}
-            </if>
-            <if test="record.homeFlag != null and !&quot;&quot;.equals(record.homeFlag)">
-                and home_flag = #{record.homeFlag}
-            </if>
-            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and rank = #{record.rank}
-            </if>
-            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and store_id = #{record.storeId}
-            </if>
-            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.salesVolume != null and !&quot;&quot;.equals(record.salesVolume)">
-                and sales_volume = #{record.salesVolume}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR service_type LIKE concat('%',#{record.searchKey},'%')
-                    OR subclass LIKE concat('%',#{record.searchKey},'%')
-                    OR title LIKE concat('%',#{record.searchKey},'%')
-                    OR service_detail LIKE concat('%',#{record.searchKey},'%')
-                    OR inventory LIKE concat('%',#{record.searchKey},'%')
-                    OR on_shelf LIKE concat('%',#{record.searchKey},'%')
-                    OR use_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR hot_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR home_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR rank LIKE concat('%',#{record.searchKey},'%')
-                    OR store_id LIKE concat('%',#{record.searchKey},'%')
-                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR sales_volume 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>
-        rank desc, id desc
-    </select>
-    <select id="queryAllProductInfo" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from product_info
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
-                and id in (${idStr})
-            </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="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="subclass != null and !&quot;&quot;.equals(subclass)">
-                and subclass = #{subclass}
-            </if>
-            <if test="title != null and !&quot;&quot;.equals(title)">
-                and title = #{title}
-            </if>
-            <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-            <if test="serviceDetail != null and !&quot;&quot;.equals(serviceDetail)">
-                and service_detail = #{serviceDetail}
-            </if>
-            <if test="inventory != null and !&quot;&quot;.equals(inventory)">
-                and inventory = #{inventory}
-            </if>
-            <if test="onShelf != null and !&quot;&quot;.equals(onShelf)">
-                and on_shelf = #{onShelf}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
-                and hot_flag = #{hotFlag}
-            </if>
-            <if test="homeFlag != null and !&quot;&quot;.equals(homeFlag)">
-                and home_flag = #{homeFlag}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="salesVolume != null and !&quot;&quot;.equals(salesVolume)">
-                and sales_volume = #{salesVolume}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR service_type LIKE concat('%',#{searchKey},'%')
-                    OR subclass LIKE concat('%',#{searchKey},'%')
-                    OR title LIKE concat('%',#{searchKey},'%')
-                    OR service_detail LIKE concat('%',#{searchKey},'%')
-                    OR inventory LIKE concat('%',#{searchKey},'%')
-                    OR on_shelf LIKE concat('%',#{searchKey},'%')
-                    OR use_flag LIKE concat('%',#{searchKey},'%')
-                    OR hot_flag LIKE concat('%',#{searchKey},'%')
-                    OR home_flag LIKE concat('%',#{searchKey},'%')
-                    OR rank LIKE concat('%',#{searchKey},'%')
-                    OR store_id LIKE concat('%',#{searchKey},'%')
-                    OR type_flag LIKE concat('%',#{searchKey},'%')
-                    OR sales_volume 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>
-
-        rank desc, id desc
-    </select>
-    <select id="queryProductInfo" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
-        select
-        <include refid="Base_Column_List"/>
-        from product_info
-        <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="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="subclass != null and !&quot;&quot;.equals(subclass)">
-                and subclass = #{subclass}
-            </if>
-            <if test="title != null and !&quot;&quot;.equals(title)">
-                and title = #{title}
-            </if>
-            <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-            <if test="serviceDetail != null and !&quot;&quot;.equals(serviceDetail)">
-                and service_detail = #{serviceDetail}
-            </if>
-            <if test="inventory != null and !&quot;&quot;.equals(inventory)">
-                and inventory = #{inventory}
-            </if>
-            <if test="onShelf != null and !&quot;&quot;.equals(onShelf)">
-                and on_shelf = #{onShelf}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
-                and hot_flag = #{hotFlag}
-            </if>
-            <if test="homeFlag != null and !&quot;&quot;.equals(homeFlag)">
-                and home_flag = #{homeFlag}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="salesVolume != null and !&quot;&quot;.equals(salesVolume)">
-                and sales_volume = #{salesVolume}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE product_info SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from product_info
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-
-    <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.ProductInfo" extends="BaseResultMap">
-
-
-        <association property="storeInfo"
-                    javaType="com.izouma.awesomeadmin.model.StoreInfo"
-                    select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryStoreInfo"
-                    column="{ id = store_id }"/>
-
-        <collection property="productPriceList"
-                    ofType="com.izouma.awesomeadmin.model.ProductPrice"
-                    select="com.izouma.awesomeadmin.dao.ProductPriceMapper.queryAllProductPrice"
-                    column="{ productId = id }"/>
-
-    </resultMap>
-
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ProductPriceMapper.java

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

+ 0 - 506
src/main/java/com/izouma/awesomeadmin/dao/ProductPriceMapper.xml

@@ -1,506 +0,0 @@
-<?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.ProductPriceMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductPrice">
-        <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="product_id" property="productId" jdbcType="VARCHAR"/>
-        <result column="name" property="name" jdbcType="VARCHAR"/>
-        <result column="price" property="price" jdbcType="DECIMAL"/>
-        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-        <result column="min_counts" property="minCounts" jdbcType="INTEGER"/>
-        <result column="max_counts" property="maxCounts" jdbcType="INTEGER"/>
-        <result column="inventory" property="inventory" jdbcType="INTEGER"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            product_id,
-
-            name,
-
-            price,
-
-            type_flag,
-
-            min_counts,
-
-            max_counts,
-
-            inventory,
-
-            remark,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from product_price
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from product_price
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductPrice" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into product_price
-        <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="productId!= null">
-                product_id,
-            </if>
-            <if test="name!= null">
-                name,
-            </if>
-            <if test="price!= null">
-                price,
-            </if>
-            <if test="typeFlag!= null">
-                type_flag,
-            </if>
-            <if test="minCounts!= null">
-                min_counts,
-            </if>
-            <if test="maxCounts!= null and maxCounts&gt;0">
-                max_counts,
-            </if>
-            <if test="inventory!= null">
-                inventory,
-            </if>
-            <if test="remark!= null">
-                remark,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="productId != null">
-                #{productId,jdbcType=VARCHAR},
-            </if>
-            <if test="name != null">
-                #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="price != null">
-                #{price,jdbcType=DECIMAL},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="minCounts != null">
-                #{minCounts,jdbcType=INTEGER},
-            </if>
-            <if test="maxCounts != null and maxCounts&gt;0">
-                #{maxCounts,jdbcType=INTEGER},
-            </if>
-            <if test="inventory != null">
-                #{inventory,jdbcType=INTEGER},
-            </if>
-            <if test="remark != null">
-                #{remark,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductPrice">
-        update product_price
-        <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="productId != null">
-                product_id= #{productId,jdbcType=VARCHAR},
-            </if>
-            <if test="name != null">
-                name= #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="price != null">
-                price= #{price,jdbcType=DECIMAL},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="minCounts != null">
-                min_counts= #{minCounts,jdbcType=INTEGER},
-            </if>
-            <if test="maxCounts != null">
-                <choose>
-                    <when test="maxCounts&lt;0">
-                        max_counts = null,
-                    </when>
-                    <otherwise>
-                        max_counts= #{maxCounts,jdbcType=INTEGER},
-                    </otherwise>
-                </choose>
-
-            </if>
-            <if test="inventory != null">
-                inventory= #{inventory,jdbcType=INTEGER},
-            </if>
-            <if test="remark != null">
-                remark= #{remark,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryProductPriceByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select
-        <include refid="Base_Column_List"/>
-        from product_price
-        <where>
-            and del_flag = 'N'
-            <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.productId != null and !&quot;&quot;.equals(record.productId)">
-                and product_id = #{record.productId}
-            </if>
-            <if test="record.name != null and !&quot;&quot;.equals(record.name)">
-                and name = #{record.name}
-            </if>
-            <if test="record.price != null and !&quot;&quot;.equals(record.price)">
-                and price = #{record.price}
-            </if>
-            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.minCounts != null and !&quot;&quot;.equals(record.minCounts)">
-                and min_counts = #{record.minCounts}
-            </if>
-            <if test="record.maxCounts != null and !&quot;&quot;.equals(record.maxCounts)">
-                and max_counts = #{record.maxCounts}
-            </if>
-            <if test="record.inventory != null and !&quot;&quot;.equals(record.inventory)">
-                and inventory = #{record.inventory}
-            </if>
-            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and remark = #{record.remark}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR product_id LIKE concat('%',#{record.searchKey},'%')
-                    OR name LIKE concat('%',#{record.searchKey},'%')
-                    OR price LIKE concat('%',#{record.searchKey},'%')
-                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR min_counts LIKE concat('%',#{record.searchKey},'%')
-                    OR max_counts LIKE concat('%',#{record.searchKey},'%')
-                    OR inventory LIKE concat('%',#{record.searchKey},'%')
-                    OR remark LIKE concat('%',#{record.searchKey},'%')
-                </trim>
-            </if>
-
-            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
-                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-
-        </where>
-        order by
-
-        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-        product_id, type_flag , id desc
-    </select>
-    <select id="queryAllProductPrice" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select
-        <include refid="Base_Column_List"/>
-        from product_price
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </if>
-            <if test="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-            <if test="price != null and !&quot;&quot;.equals(price)">
-                and price = #{price}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="minCounts != null and !&quot;&quot;.equals(minCounts)">
-                and min_counts = #{minCounts}
-            </if>
-            <if test="maxCounts != null and !&quot;&quot;.equals(maxCounts)">
-                and max_counts = #{maxCounts}
-            </if>
-            <if test="inventory != null and !&quot;&quot;.equals(inventory)">
-                and inventory = #{inventory}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR product_id LIKE concat('%',#{searchKey},'%')
-                    OR name LIKE concat('%',#{searchKey},'%')
-                    OR price LIKE concat('%',#{searchKey},'%')
-                    OR type_flag LIKE concat('%',#{searchKey},'%')
-                    OR min_counts LIKE concat('%',#{searchKey},'%')
-                    OR max_counts LIKE concat('%',#{searchKey},'%')
-                    OR inventory LIKE concat('%',#{searchKey},'%')
-                    OR remark LIKE concat('%',#{searchKey},'%')
-                </trim>
-            </if>
-            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-                    <choose>
-                        <when test="item.indexOf('like') != -1">
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    concat('%',#{itemDetail},'%')
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </when>
-                        <otherwise>
-                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                                <if test="detailIndex == 3">
-                                    #{itemDetail}
-                                </if>
-
-                                <if test="detailIndex &lt; 3">
-                                    ${itemDetail}
-                                </if>
-
-                            </foreach>
-                        </otherwise>
-                    </choose>
-
-
-                </foreach>
-
-
-            </if>
-        </where>
-        order by
-
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-
-        product_id, type_flag , id desc
-    </select>
-    <select id="queryProductPrice" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select
-        <include refid="Base_Column_List"/>
-        from product_price
-        <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="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </if>
-            <if test="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-            <if test="price != null and !&quot;&quot;.equals(price)">
-                and price = #{price}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="minCounts != null and !&quot;&quot;.equals(minCounts)">
-                and min_counts = #{minCounts}
-            </if>
-            <if test="maxCounts != null and !&quot;&quot;.equals(maxCounts)">
-                and max_counts = #{maxCounts}
-            </if>
-            <if test="inventory != null and !&quot;&quot;.equals(inventory)">
-                and inventory = #{inventory}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE product_price SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select
-        <include refid="Base_Column_List"/>
-        from product_price
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/QuickLinksMapper.java

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

+ 0 - 417
src/main/java/com/izouma/awesomeadmin/dao/QuickLinksMapper.xml

@@ -1,417 +0,0 @@
-<?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.QuickLinksMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.QuickLinks" >
-                <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="type_flag" property="typeFlag" jdbcType="INTEGER" />
-                                <result column="link_name" property="linkName" jdbcType="VARCHAR" />
-                                <result column="url" property="url" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            type_flag,
-
-            link_name,
-
-            url,
-
-            remark,
-
-            rank,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from quick_links
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from quick_links
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.QuickLinks" useGeneratedKeys="true" keyProperty="id">
-        insert into quick_links
-        <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="typeFlag!= null" >
-                type_flag,
-            </if>
-                <if test="linkName!= null" >
-                link_name,
-            </if>
-                <if test="url!= null" >
-                url,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </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="typeFlag != null" >
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-                    <if test="linkName != null" >
-                #{linkName,jdbcType=VARCHAR},
-            </if>
-                    <if test="url != null" >
-                #{url,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.QuickLinks" >
-        update quick_links
-        <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="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-                     <if test="linkName != null" >
-               link_name= #{linkName,jdbcType=VARCHAR},
-            </if>
-                     <if test="url != null" >
-               url= #{url,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryQuickLinksByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QuickLinks">
-        select <include refid="Base_Column_List"/> from quick_links
-        <where>
-            and del_flag = 'N'
-                    <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.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
-            </if>
-                     <if test="record.linkName != null and !&quot;&quot;.equals(record.linkName)">
-                and  link_name = #{record.linkName}
-            </if>
-                     <if test="record.url != null and !&quot;&quot;.equals(record.url)">
-                and  url = #{record.url}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  link_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank 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>
-        type_flag, rank desc , id desc
-    </select>
-    <select id="queryAllQuickLinks" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QuickLinks">
-        select <include refid="Base_Column_List"/> from quick_links
-        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
-            </if>
-                    <if test="linkName != null and !&quot;&quot;.equals(linkName)">
-                and  link_name = #{linkName}
-            </if>
-                    <if test="url != null and !&quot;&quot;.equals(url)">
-                and  url = #{url}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  link_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank 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>
-
-        type_flag, rank desc , id desc
-    </select>
-    <select id="queryQuickLinks" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QuickLinks">
-        select <include refid="Base_Column_List"/> from quick_links
-        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-                     <if test="linkName != null and !&quot;&quot;.equals(linkName)">
-                and link_name = #{linkName}
-            </if>
-                     <if test="url != null and !&quot;&quot;.equals(url)">
-                and url = #{url}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE quick_links SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QuickLinks">
-        select <include refid="Base_Column_List"/> from quick_links
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeDetailMapper.java

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

+ 0 - 394
src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeDetailMapper.xml

@@ -1,394 +0,0 @@
-<?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.ServiceTypeDetailMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ServiceTypeDetail" >
-                <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="parent_id" property="parentId" jdbcType="INTEGER" />
-                                <result column="type_name" property="typeName" jdbcType="VARCHAR" />
-                                <result column="description" property="description" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            parent_id,
-
-            type_name,
-
-            description,
-
-            rank,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from service_type_detail
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from service_type_detail
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ServiceTypeDetail" useGeneratedKeys="true" keyProperty="id">
-        insert into service_type_detail
-        <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="parentId!= null" >
-                parent_id,
-            </if>
-                <if test="typeName!= null" >
-                type_name,
-            </if>
-                <if test="description!= null" >
-                description,
-            </if>
-                <if test="rank!= null" >
-                rank,
-            </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="parentId != null" >
-                #{parentId,jdbcType=INTEGER},
-            </if>
-                    <if test="typeName != null" >
-                #{typeName,jdbcType=VARCHAR},
-            </if>
-                    <if test="description != null" >
-                #{description,jdbcType=VARCHAR},
-            </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ServiceTypeDetail" >
-        update service_type_detail
-        <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="parentId != null" >
-               parent_id= #{parentId,jdbcType=INTEGER},
-            </if>
-                     <if test="typeName != null" >
-               type_name= #{typeName,jdbcType=VARCHAR},
-            </if>
-                     <if test="description != null" >
-               description= #{description,jdbcType=VARCHAR},
-            </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryServiceTypeDetailByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ServiceTypeDetail">
-        select <include refid="Base_Column_List"/> from service_type_detail
-        <where>
-            and del_flag = 'N'
-                    <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.parentId != null and !&quot;&quot;.equals(record.parentId)">
-                and  parent_id = #{record.parentId}
-            </if>
-                     <if test="record.typeName != null and !&quot;&quot;.equals(record.typeName)">
-                and  type_name = #{record.typeName}
-            </if>
-                     <if test="record.description != null and !&quot;&quot;.equals(record.description)">
-                and  description = #{record.description}
-            </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  parent_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  description LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank 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>
-        rank desc , id desc
-    </select>
-    <select id="queryAllServiceTypeDetail" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ServiceTypeDetail">
-        select <include refid="Base_Column_List"/> from service_type_detail
-        <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="parentId != null and !&quot;&quot;.equals(parentId)">
-                and  parent_id = #{parentId}
-            </if>
-                    <if test="typeName != null and !&quot;&quot;.equals(typeName)">
-                and  type_name = #{typeName}
-            </if>
-                    <if test="description != null and !&quot;&quot;.equals(description)">
-                and  description = #{description}
-            </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  parent_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  description LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank 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>
-
-        rank desc , id desc
-    </select>
-    <select id="queryServiceTypeDetail" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ServiceTypeDetail">
-        select <include refid="Base_Column_List"/> from service_type_detail
-        <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="parentId != null and !&quot;&quot;.equals(parentId)">
-                and parent_id = #{parentId}
-            </if>
-                     <if test="typeName != null and !&quot;&quot;.equals(typeName)">
-                and type_name = #{typeName}
-            </if>
-                     <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE service_type_detail SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ServiceTypeDetail">
-        select <include refid="Base_Column_List"/> from service_type_detail
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 36
src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeMapper.java

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

+ 0 - 620
src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeMapper.xml

@@ -1,620 +0,0 @@
-<?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.ServiceTypeMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ServiceType">
-        <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="service_type" property="serviceType" jdbcType="VARCHAR"/>
-        <result column="short_name" property="shortName" jdbcType="VARCHAR"/>
-        <result column="image" property="image" jdbcType="VARCHAR"/>
-        <result column="color" property="color" jdbcType="VARCHAR"/>
-        <result column="rank" property="rank" jdbcType="INTEGER"/>
-        <result column="show_flag" property="showFlag" jdbcType="CHAR"/>
-        <result column="description" property="description" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            service_type,
-
-            short_name,
-
-            image,
-
-            color,
-
-            rank,
-
-            show_flag,
-
-            description,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from service_type
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from service_type
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ServiceType" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into service_type
-        <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="serviceType!= null">
-                service_type,
-            </if>
-            <if test="shortName!= null">
-                short_name,
-            </if>
-            <if test="image!= null">
-                image,
-            </if>
-            <if test="color!= null">
-                color,
-            </if>
-            <if test="rank!= null">
-                rank,
-            </if>
-            <if test="showFlag!= null">
-                show_flag,
-            </if>
-            <if test="description!= null">
-                description,
-            </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="serviceType != null">
-                #{serviceType,jdbcType=VARCHAR},
-            </if>
-            <if test="shortName != null">
-                #{shortName,jdbcType=VARCHAR},
-            </if>
-            <if test="image != null">
-                #{image,jdbcType=VARCHAR},
-            </if>
-            <if test="color != null">
-                #{color,jdbcType=VARCHAR},
-            </if>
-            <if test="rank != null">
-                #{rank,jdbcType=INTEGER},
-            </if>
-            <if test="showFlag != null">
-                #{showFlag,jdbcType=CHAR},
-            </if>
-            <if test="description != null">
-                #{description,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ServiceType">
-        update service_type
-        <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="serviceType != null">
-                service_type= #{serviceType,jdbcType=VARCHAR},
-            </if>
-            <if test="shortName != null">
-                short_name= #{shortName,jdbcType=VARCHAR},
-            </if>
-            <if test="image != null">
-                image= #{image,jdbcType=VARCHAR},
-            </if>
-            <if test="color != null">
-                color= #{color,jdbcType=VARCHAR},
-            </if>
-            <if test="rank != null">
-                rank= #{rank,jdbcType=INTEGER},
-            </if>
-            <if test="showFlag != null">
-                show_flag= #{showFlag,jdbcType=CHAR},
-            </if>
-            <if test="description != null">
-                description= #{description,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryServiceTypeByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.ServiceType">
-        select
-        <include refid="Base_Column_List"/>
-        from service_type
-        <where>
-            and del_flag = 'N'
-            <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.serviceType != null and !&quot;&quot;.equals(record.serviceType)">
-                and service_type = #{record.serviceType}
-            </if>
-            <if test="record.shortName != null and !&quot;&quot;.equals(record.shortName)">
-                and short_name = #{record.shortName}
-            </if>
-            <if test="record.image != null and !&quot;&quot;.equals(record.image)">
-                and image = #{record.image}
-            </if>
-            <if test="record.color != null and !&quot;&quot;.equals(record.color)">
-                and color = #{record.color}
-            </if>
-            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and rank = #{record.rank}
-            </if>
-            <if test="record.showFlag != null and !&quot;&quot;.equals(record.showFlag)">
-                and show_flag = #{record.showFlag}
-            </if>
-            <if test="record.description != null and !&quot;&quot;.equals(record.description)">
-                and description = #{record.description}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR service_type LIKE concat('%',#{record.searchKey},'%')
-                    OR short_name LIKE concat('%',#{record.searchKey},'%')
-                    OR image LIKE concat('%',#{record.searchKey},'%')
-                    OR color LIKE concat('%',#{record.searchKey},'%')
-                    OR rank LIKE concat('%',#{record.searchKey},'%')
-                    OR show_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR description 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>
-        rank desc , id desc
-    </select>
-    <select id="queryAllServiceType" parameterType="java.util.Map"
-            resultMap="InfoWithList">
-        select
-        <include refid="Base_Column_List"/>
-        from service_type
-        <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="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="shortName != null and !&quot;&quot;.equals(shortName)">
-                and short_name = #{shortName}
-            </if>
-            <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-            <if test="color != null and !&quot;&quot;.equals(color)">
-                and color = #{color}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="showFlag != null and !&quot;&quot;.equals(showFlag)">
-                and show_flag = #{showFlag}
-            </if>
-            <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR service_type LIKE concat('%',#{searchKey},'%')
-                    OR short_name LIKE concat('%',#{searchKey},'%')
-                    OR image LIKE concat('%',#{searchKey},'%')
-                    OR color LIKE concat('%',#{searchKey},'%')
-                    OR rank LIKE concat('%',#{searchKey},'%')
-                    OR show_flag LIKE concat('%',#{searchKey},'%')
-                    OR description 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>
-
-        rank desc , id desc
-    </select>
-    <select id="queryAllServiceTypeForHome" parameterType="java.util.Map"
-            resultMap="InfoWithListForHome">
-        select
-        <include refid="Base_Column_List"/>,
-        1 as homeFlag,
-        'Y' as useFlag,
-        6 as homeLimit,
-        10 as hotLimit
-
-        from service_type
-        <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="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="shortName != null and !&quot;&quot;.equals(shortName)">
-                and short_name = #{shortName}
-            </if>
-            <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-            <if test="color != null and !&quot;&quot;.equals(color)">
-                and color = #{color}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="showFlag != null and !&quot;&quot;.equals(showFlag)">
-                and show_flag = #{showFlag}
-            </if>
-            <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR service_type LIKE concat('%',#{searchKey},'%')
-                    OR short_name LIKE concat('%',#{searchKey},'%')
-                    OR image LIKE concat('%',#{searchKey},'%')
-                    OR color LIKE concat('%',#{searchKey},'%')
-                    OR rank LIKE concat('%',#{searchKey},'%')
-                    OR show_flag LIKE concat('%',#{searchKey},'%')
-                    OR description 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>
-
-        rank desc , id desc
-    </select>
-    <select id="queryServiceType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ServiceType">
-        select
-        <include refid="Base_Column_List"/>
-        from service_type
-        <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="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="shortName != null and !&quot;&quot;.equals(shortName)">
-                and short_name = #{shortName}
-            </if>
-            <if test="image != null and !&quot;&quot;.equals(image)">
-                and image = #{image}
-            </if>
-            <if test="color != null and !&quot;&quot;.equals(color)">
-                and color = #{color}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="showFlag != null and !&quot;&quot;.equals(showFlag)">
-                and show_flag = #{showFlag}
-            </if>
-            <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE service_type SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ServiceType">
-        select
-        <include refid="Base_Column_List"/>
-        from service_type
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-
-
-    <resultMap id="InfoWithList" type="com.izouma.awesomeadmin.model.ServiceType" extends="BaseResultMap">
-
-
-        <collection property="serviceTypeDetailList"
-                    ofType="com.izouma.awesomeadmin.model.ServiceTypeDetail"
-                    select="com.izouma.awesomeadmin.dao.ServiceTypeDetailMapper.queryAllServiceTypeDetail"
-                    column="{ parentId = id }"/>
-
-    </resultMap>
-
-    <resultMap id="InfoWithListForHome" type="com.izouma.awesomeadmin.model.ServiceType" extends="BaseResultMap">
-
-
-        <collection property="serviceTypeDetailList"
-                    ofType="com.izouma.awesomeadmin.model.ServiceTypeDetail"
-                    select="com.izouma.awesomeadmin.dao.ServiceTypeDetailMapper.queryAllServiceTypeDetail"
-                    column="{ parentId = id }"/>
-
-        <collection property="homeStoreInfoList"
-                    ofType="com.izouma.awesomeadmin.model.StoreInfo"
-                    select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryAllStoreInfoForHome"
-                    column="{ serviceType = id , homeFlag = homeFlag , useFlag = useFlag , limitNum = homeLimit }"/>
-
-        <collection property="hotStoreInfoList"
-                    ofType="com.izouma.awesomeadmin.model.StoreInfo"
-                    select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryAllStoreInfoForHome"
-                    column="{ serviceType = id , hotFlag = homeFlag , useFlag = useFlag , limitNum = hotLimit }"/>
-
-    </resultMap>
-
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/ShopAgreementMapper.java

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

+ 0 - 348
src/main/java/com/izouma/awesomeadmin/dao/ShopAgreementMapper.xml

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

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/StoreCollectionMapper.java

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

+ 0 - 382
src/main/java/com/izouma/awesomeadmin/dao/StoreCollectionMapper.xml

@@ -1,382 +0,0 @@
-<?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.StoreCollectionMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.StoreCollection" >
-                <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="type_flag" property="typeFlag" jdbcType="INTEGER" />
-                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
-                                <result column="target_id" property="targetId" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            type_flag,
-
-            user_id,
-
-            target_id,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from store_collection
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from store_collection
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.StoreCollection" useGeneratedKeys="true" keyProperty="id">
-        insert into store_collection
-        <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="typeFlag!= null" >
-                type_flag,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="targetId!= null" >
-                target_id,
-            </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="typeFlag != null" >
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=VARCHAR},
-            </if>
-                    <if test="targetId != null" >
-                #{targetId,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.StoreCollection" >
-        update store_collection
-        <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="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-                     <if test="targetId != null" >
-               target_id= #{targetId,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryStoreCollectionByPage" parameterType="java.util.Map" resultMap="AllInfoForList">
-        select <include refid="Base_Column_List"/> from store_collection
-        <where>
-            and del_flag = 'N'
-                    <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.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
-            </if>
-                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and  user_id = #{record.userId}
-            </if>
-                     <if test="record.targetId != null and !&quot;&quot;.equals(record.targetId)">
-                and  target_id = #{record.targetId}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  target_id 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="queryAllStoreCollection" parameterType="java.util.Map" resultMap="AllInfoForList">
-        select <include refid="Base_Column_List"/> from store_collection
-        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
-            </if>
-                    <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and  user_id = #{userId}
-            </if>
-                    <if test="targetId != null and !&quot;&quot;.equals(targetId)">
-                and  target_id = #{targetId}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  target_id 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="queryStoreCollection" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreCollection">
-        select <include refid="Base_Column_List"/> from store_collection
-        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-                     <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-                     <if test="targetId != null and !&quot;&quot;.equals(targetId)">
-                and target_id = #{targetId}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE store_collection SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreCollection">
-        select <include refid="Base_Column_List"/> from store_collection
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-
-    <resultMap id="AllInfoForList" type="com.izouma.awesomeadmin.model.StoreCollection" extends="BaseResultMap">
-
-
-        <association property="storeInfo"
-                     javaType="com.izouma.awesomeadmin.model.StoreInfo"
-                     select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryStoreInfo"
-                     column="{ id = target_id }"/>
-
-    </resultMap>
-
-</mapper>
-

+ 0 - 37
src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.java

@@ -1,37 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import java.util.*;
-import com.izouma.awesomeadmin.datasource.DataSource;
-import org.springframework.stereotype.Repository;
-import com.izouma.awesomeadmin.model.StoreInfo;
-
-
-/**
-*  Dao接口
-*/
-@Repository("com.zoumaframe.dao.StoreInfoMapper")
-public interface StoreInfoMapper{
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insertSelective(StoreInfo record);
-
-    StoreInfo selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(StoreInfo record);
-
-    List<StoreInfo> queryAllStoreInfo(StoreInfo record);
-
-    List<StoreInfo> queryAllStoreInfoForHome(StoreInfo record);
-
-    List<StoreInfo> queryStoreInfoByPage(Map<String, Object> parameter);
-
-    int delete(String id);
-
-    StoreInfo queryStoreInfo(StoreInfo record);
-
-    List<StoreInfo> query(StoreInfo record);
-
-    int updateUseFlagByUserId(Map<String,Object> parameter);
-}
-

+ 0 - 955
src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.xml

@@ -1,955 +0,0 @@
-<?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.StoreInfoMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.StoreInfo">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="user_name" property="userName" jdbcType="VARCHAR"/>
-        <result column="store_name" property="storeName" jdbcType="VARCHAR"/>
-        <result column="service_type" property="serviceType" jdbcType="VARCHAR"/>
-        <result column="description" property="description" jdbcType="VARCHAR"/>
-        <result column="icon" property="icon" jdbcType="VARCHAR"/>
-        <result column="province" property="province" jdbcType="VARCHAR"/>
-        <result column="citye" property="citye" jdbcType="VARCHAR"/>
-        <result column="district" property="district" jdbcType="VARCHAR"/>
-        <result column="address_detail" property="addressDetail" jdbcType="VARCHAR"/>
-        <result column="bank_card" property="bankCard" jdbcType="VARCHAR"/>
-        <result column="bank_name" property="bankName" jdbcType="VARCHAR"/>
-        <result column="open_name" property="openName" jdbcType="VARCHAR"/>
-        <result column="credit" property="credit" jdbcType="VARCHAR"/>
-        <result column="use_flag" property="useFlag" jdbcType="CHAR"/>
-        <result column="rank" property="rank" jdbcType="INTEGER"/>
-        <result column="response_time" property="responseTime" jdbcType="INTEGER"/>
-        <result column="rework_rate" property="reworkRate" jdbcType="INTEGER"/>
-        <result column="hot_flag" property="hotFlag" jdbcType="INTEGER"/>
-        <result column="home_flag" property="homeFlag" jdbcType="INTEGER"/>
-        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
-        <result column="subclass" property="subclass" jdbcType="VARCHAR"/>
-        <result column="storelabel" property="storelabel" jdbcType="VARCHAR"/>
-        <result column="memory_space" property="memorySpace" jdbcType="DECIMAL"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            user_name,
-
-            store_name,
-
-            service_type,
-
-            description,
-
-            icon,
-
-            province,
-
-            citye,
-
-            district,
-
-            address_detail,
-
-            bank_card,
-
-            bank_name,
-
-            open_name,
-
-            credit,
-
-            use_flag,
-
-            rank,
-
-            response_time,
-
-            rework_rate,
-
-            hot_flag,
-
-            home_flag,
-
-            type_flag,
-
-            subclass,
-
-            storelabel,
-
-            memory_space,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from store_info
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from store_info
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.StoreInfo" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into store_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!= null">
-                id,
-            </if>
-            <if test="delFlag!= null">
-                del_flag,
-            </if>
-            <if test="updateTime!= null">
-                update_time,
-            </if>
-            <if test="updateUser!= null">
-                update_user,
-            </if>
-            <if test="createTime!= null">
-                create_time,
-            </if>
-            <if test="createUser!= null">
-                create_user,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="userName!= null">
-                user_name,
-            </if>
-            <if test="storeName!= null">
-                store_name,
-            </if>
-            <if test="serviceType!= null">
-                service_type,
-            </if>
-            <if test="description!= null">
-                description,
-            </if>
-            <if test="icon!= null">
-                icon,
-            </if>
-            <if test="province!= null">
-                province,
-            </if>
-            <if test="citye!= null">
-                citye,
-            </if>
-            <if test="district!= null">
-                district,
-            </if>
-            <if test="addressDetail!= null">
-                address_detail,
-            </if>
-            <if test="bankCard!= null">
-                bank_card,
-            </if>
-            <if test="bankName!= null">
-                bank_name,
-            </if>
-            <if test="openName!= null">
-                open_name,
-            </if>
-            <if test="credit!= null">
-                credit,
-            </if>
-            <if test="useFlag!= null">
-                use_flag,
-            </if>
-            <if test="rank!= null">
-                rank,
-            </if>
-            <if test="responseTime!= null">
-                response_time,
-            </if>
-            <if test="reworkRate!= null">
-                rework_rate,
-            </if>
-            <if test="hotFlag!= null">
-                hot_flag,
-            </if>
-            <if test="homeFlag!= null">
-                home_flag,
-            </if>
-            <if test="typeFlag!= null">
-                type_flag,
-            </if>
-            <if test="subclass!= null">
-                subclass,
-            </if>
-            <if test="storelabel!= null">
-                storelabel,
-            </if>
-            <if test="memorySpace!= null">
-                memory_space,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="userName != null">
-                #{userName,jdbcType=VARCHAR},
-            </if>
-            <if test="storeName != null">
-                #{storeName,jdbcType=VARCHAR},
-            </if>
-            <if test="serviceType != null">
-                #{serviceType,jdbcType=VARCHAR},
-            </if>
-            <if test="description != null">
-                #{description,jdbcType=VARCHAR},
-            </if>
-            <if test="icon != null">
-                #{icon,jdbcType=VARCHAR},
-            </if>
-            <if test="province != null">
-                #{province,jdbcType=VARCHAR},
-            </if>
-            <if test="citye != null">
-                #{citye,jdbcType=VARCHAR},
-            </if>
-            <if test="district != null">
-                #{district,jdbcType=VARCHAR},
-            </if>
-            <if test="addressDetail != null">
-                #{addressDetail,jdbcType=VARCHAR},
-            </if>
-            <if test="bankCard != null">
-                #{bankCard,jdbcType=VARCHAR},
-            </if>
-            <if test="bankName != null">
-                #{bankName,jdbcType=VARCHAR},
-            </if>
-            <if test="openName != null">
-                #{openName,jdbcType=VARCHAR},
-            </if>
-            <if test="credit != null">
-                #{credit,jdbcType=VARCHAR},
-            </if>
-            <if test="useFlag != null">
-                #{useFlag,jdbcType=CHAR},
-            </if>
-            <if test="rank != null">
-                #{rank,jdbcType=INTEGER},
-            </if>
-            <if test="responseTime != null">
-                #{responseTime,jdbcType=INTEGER},
-            </if>
-            <if test="reworkRate != null">
-                #{reworkRate,jdbcType=INTEGER},
-            </if>
-            <if test="hotFlag != null">
-                #{hotFlag,jdbcType=INTEGER},
-            </if>
-            <if test="homeFlag != null">
-                #{homeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="typeFlag != null">
-                #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="subclass != null">
-                #{subclass,jdbcType=VARCHAR},
-            </if>
-            <if test="storelabel != null">
-                #{storelabel,jdbcType=VARCHAR},
-            </if>
-            <if test="memorySpace != null">
-                #{memorySpace,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.StoreInfo">
-        update store_info
-        <set>
-            <if test="id != null">
-                id= #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                user_id= #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="userName != null">
-                user_name= #{userName,jdbcType=VARCHAR},
-            </if>
-            <if test="storeName != null">
-                store_name= #{storeName,jdbcType=VARCHAR},
-            </if>
-            <if test="serviceType != null">
-                service_type= #{serviceType,jdbcType=VARCHAR},
-            </if>
-            <if test="description != null">
-                description= #{description,jdbcType=VARCHAR},
-            </if>
-            <if test="icon != null">
-                icon= #{icon,jdbcType=VARCHAR},
-            </if>
-            <if test="province != null">
-                province= #{province,jdbcType=VARCHAR},
-            </if>
-            <if test="citye != null">
-                citye= #{citye,jdbcType=VARCHAR},
-            </if>
-            <if test="district != null">
-                district= #{district,jdbcType=VARCHAR},
-            </if>
-            <if test="addressDetail != null">
-                address_detail= #{addressDetail,jdbcType=VARCHAR},
-            </if>
-            <if test="bankCard != null">
-                bank_card= #{bankCard,jdbcType=VARCHAR},
-            </if>
-            <if test="bankName != null">
-                bank_name= #{bankName,jdbcType=VARCHAR},
-            </if>
-            <if test="openName != null">
-                open_name= #{openName,jdbcType=VARCHAR},
-            </if>
-            <if test="credit != null">
-                credit= #{credit,jdbcType=VARCHAR},
-            </if>
-            <if test="useFlag != null">
-                use_flag= #{useFlag,jdbcType=CHAR},
-            </if>
-            <if test="rank != null">
-                rank= #{rank,jdbcType=INTEGER},
-            </if>
-            <if test="responseTime != null">
-                response_time= #{responseTime,jdbcType=INTEGER},
-            </if>
-            <if test="reworkRate != null">
-                rework_rate= #{reworkRate,jdbcType=INTEGER},
-            </if>
-            <if test="hotFlag != null">
-                hot_flag= #{hotFlag,jdbcType=INTEGER},
-            </if>
-            <if test="homeFlag != null">
-                home_flag= #{homeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag,jdbcType=INTEGER},
-            </if>
-            <if test="subclass != null">
-                subclass= #{subclass,jdbcType=VARCHAR},
-            </if>
-            <if test="storelabel != null">
-                storelabel= #{storelabel,jdbcType=VARCHAR},
-            </if>
-            <if test="memorySpace != null">
-                memory_space= #{memorySpace,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryStoreInfoByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.StoreInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from store_info
-        <where>
-            and del_flag = 'N'
-            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and id = #{record.id}
-            </if>
-            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and del_flag = #{record.delFlag}
-            </if>
-            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and update_time = #{record.updateTime}
-            </if>
-            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and update_user = #{record.updateUser}
-            </if>
-            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and create_time = #{record.createTime}
-            </if>
-            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and create_user = #{record.createUser}
-            </if>
-            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and user_id = #{record.userId}
-            </if>
-            <if test="record.userName != null and !&quot;&quot;.equals(record.userName)">
-                and user_name = #{record.userName}
-            </if>
-            <if test="record.storeName != null and !&quot;&quot;.equals(record.storeName)">
-                and store_name = #{record.storeName}
-            </if>
-            <if test="record.serviceType != null and !&quot;&quot;.equals(record.serviceType)">
-                and service_type = #{record.serviceType}
-            </if>
-            <if test="record.description != null and !&quot;&quot;.equals(record.description)">
-                and description = #{record.description}
-            </if>
-            <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
-                and icon = #{record.icon}
-            </if>
-            <if test="record.province != null and !&quot;&quot;.equals(record.province)">
-                and province = #{record.province}
-            </if>
-            <if test="record.citye != null and !&quot;&quot;.equals(record.citye)">
-                and citye = #{record.citye}
-            </if>
-            <if test="record.district != null and !&quot;&quot;.equals(record.district)">
-                and district = #{record.district}
-            </if>
-            <if test="record.addressDetail != null and !&quot;&quot;.equals(record.addressDetail)">
-                and address_detail = #{record.addressDetail}
-            </if>
-            <if test="record.bankCard != null and !&quot;&quot;.equals(record.bankCard)">
-                and bank_card = #{record.bankCard}
-            </if>
-            <if test="record.bankName != null and !&quot;&quot;.equals(record.bankName)">
-                and bank_name = #{record.bankName}
-            </if>
-            <if test="record.openName != null and !&quot;&quot;.equals(record.openName)">
-                and open_name = #{record.openName}
-            </if>
-            <if test="record.credit != null and !&quot;&quot;.equals(record.credit)">
-                and credit = #{record.credit}
-            </if>
-            <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
-                and use_flag = #{record.useFlag}
-            </if>
-            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and rank = #{record.rank}
-            </if>
-            <if test="record.responseTime != null and !&quot;&quot;.equals(record.responseTime)">
-                and response_time = #{record.responseTime}
-            </if>
-            <if test="record.reworkRate != null and !&quot;&quot;.equals(record.reworkRate)">
-                and rework_rate = #{record.reworkRate}
-            </if>
-            <if test="record.hotFlag != null and !&quot;&quot;.equals(record.hotFlag)">
-                and hot_flag = #{record.hotFlag}
-            </if>
-            <if test="record.homeFlag != null and !&quot;&quot;.equals(record.homeFlag)">
-                and home_flag = #{record.homeFlag}
-            </if>
-            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and type_flag = #{record.typeFlag}
-            </if>
-            <if test="record.subclass != null and !&quot;&quot;.equals(record.subclass)">
-                and subclass = #{record.subclass}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR user_name LIKE concat('%',#{record.searchKey},'%')
-                    OR store_name LIKE concat('%',#{record.searchKey},'%')
-                    OR service_type LIKE concat('%',#{record.searchKey},'%')
-                    OR description LIKE concat('%',#{record.searchKey},'%')
-                    OR province LIKE concat('%',#{record.searchKey},'%')
-                    OR citye LIKE concat('%',#{record.searchKey},'%')
-                    OR district LIKE concat('%',#{record.searchKey},'%')
-                    OR address_detail LIKE concat('%',#{record.searchKey},'%')
-                    OR bank_card LIKE concat('%',#{record.searchKey},'%')
-                    OR bank_name LIKE concat('%',#{record.searchKey},'%')
-                    OR open_name LIKE concat('%',#{record.searchKey},'%')
-                    OR credit LIKE concat('%',#{record.searchKey},'%')
-                    OR use_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR rank LIKE concat('%',#{record.searchKey},'%')
-                    OR response_time LIKE concat('%',#{record.searchKey},'%')
-                    OR rework_rate LIKE concat('%',#{record.searchKey},'%')
-                    OR hot_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR home_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR subclass 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>
-        rank desc , id desc
-    </select>
-    <select id="queryAllStoreInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from store_info
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and user_name = #{userName}
-            </if>
-            <if test="storeName != null and !&quot;&quot;.equals(storeName)">
-                and store_name = #{storeName}
-            </if>
-            <if test="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-            <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and icon = #{icon}
-            </if>
-            <if test="province != null and !&quot;&quot;.equals(province)">
-                and province = #{province}
-            </if>
-            <if test="citye != null and !&quot;&quot;.equals(citye)">
-                and citye = #{citye}
-            </if>
-            <if test="district != null and !&quot;&quot;.equals(district)">
-                and district = #{district}
-            </if>
-            <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and address_detail = #{addressDetail}
-            </if>
-            <if test="bankCard != null and !&quot;&quot;.equals(bankCard)">
-                and bank_card = #{bankCard}
-            </if>
-            <if test="bankName != null and !&quot;&quot;.equals(bankName)">
-                and bank_name = #{bankName}
-            </if>
-            <if test="openName != null and !&quot;&quot;.equals(openName)">
-                and open_name = #{openName}
-            </if>
-            <if test="credit != null and !&quot;&quot;.equals(credit)">
-                and credit = #{credit}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="responseTime != null and !&quot;&quot;.equals(responseTime)">
-                and response_time = #{responseTime}
-            </if>
-            <if test="reworkRate != null and !&quot;&quot;.equals(reworkRate)">
-                and rework_rate = #{reworkRate}
-            </if>
-            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
-                and hot_flag = #{hotFlag}
-            </if>
-            <if test="homeFlag != null and !&quot;&quot;.equals(homeFlag)">
-                and home_flag = #{homeFlag}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="subclass != null and !&quot;&quot;.equals(subclass)">
-                and subclass = #{subclass}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR user_name LIKE concat('%',#{searchKey},'%')
-                    OR store_name LIKE concat('%',#{searchKey},'%')
-                    OR service_type LIKE concat('%',#{searchKey},'%')
-                    OR description LIKE concat('%',#{searchKey},'%')
-                    OR province LIKE concat('%',#{searchKey},'%')
-                    OR citye LIKE concat('%',#{searchKey},'%')
-                    OR district LIKE concat('%',#{searchKey},'%')
-                    OR address_detail LIKE concat('%',#{searchKey},'%')
-                    OR bank_card LIKE concat('%',#{searchKey},'%')
-                    OR bank_name LIKE concat('%',#{searchKey},'%')
-                    OR open_name LIKE concat('%',#{searchKey},'%')
-                    OR credit LIKE concat('%',#{searchKey},'%')
-                    OR use_flag LIKE concat('%',#{searchKey},'%')
-                    OR rank LIKE concat('%',#{searchKey},'%')
-                    OR response_time LIKE concat('%',#{searchKey},'%')
-                    OR rework_rate LIKE concat('%',#{searchKey},'%')
-                    OR hot_flag LIKE concat('%',#{searchKey},'%')
-                    OR home_flag LIKE concat('%',#{searchKey},'%')
-                    OR type_flag LIKE concat('%',#{searchKey},'%')
-                    OR subclass 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>
-        rank desc , id desc
-        <if test="limitNum != null and !&quot;&quot;.equals(limitNum)">
-            LIMIT #{limitNum}
-        </if>
-    </select>
-    <select id="queryAllStoreInfoForHome" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.StoreInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from store_info
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and user_name = #{userName}
-            </if>
-            <if test="storeName != null and !&quot;&quot;.equals(storeName)">
-                and store_name = #{storeName}
-            </if>
-            <if test="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-            <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and icon = #{icon}
-            </if>
-            <if test="province != null and !&quot;&quot;.equals(province)">
-                and province = #{province}
-            </if>
-            <if test="citye != null and !&quot;&quot;.equals(citye)">
-                and citye = #{citye}
-            </if>
-            <if test="district != null and !&quot;&quot;.equals(district)">
-                and district = #{district}
-            </if>
-            <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and address_detail = #{addressDetail}
-            </if>
-            <if test="bankCard != null and !&quot;&quot;.equals(bankCard)">
-                and bank_card = #{bankCard}
-            </if>
-            <if test="bankName != null and !&quot;&quot;.equals(bankName)">
-                and bank_name = #{bankName}
-            </if>
-            <if test="openName != null and !&quot;&quot;.equals(openName)">
-                and open_name = #{openName}
-            </if>
-            <if test="credit != null and !&quot;&quot;.equals(credit)">
-                and credit = #{credit}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="responseTime != null and !&quot;&quot;.equals(responseTime)">
-                and response_time = #{responseTime}
-            </if>
-            <if test="reworkRate != null and !&quot;&quot;.equals(reworkRate)">
-                and rework_rate = #{reworkRate}
-            </if>
-            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
-                and hot_flag = #{hotFlag}
-            </if>
-            <if test="homeFlag != null and !&quot;&quot;.equals(homeFlag)">
-                and home_flag = #{homeFlag}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="subclass != null and !&quot;&quot;.equals(subclass)">
-                and subclass = #{subclass}
-            </if>
-        </where>
-        order by
-        rank desc , id desc
-        <if test="limitNum != null and !&quot;&quot;.equals(limitNum)">
-            LIMIT #{limitNum}
-        </if>
-    </select>
-    <select id="queryStoreInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from store_info
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="userName != null and !&quot;&quot;.equals(userName)">
-                and user_name = #{userName}
-            </if>
-            <if test="storeName != null and !&quot;&quot;.equals(storeName)">
-                and store_name = #{storeName}
-            </if>
-            <if test="serviceType != null and !&quot;&quot;.equals(serviceType)">
-                and service_type = #{serviceType}
-            </if>
-            <if test="description != null and !&quot;&quot;.equals(description)">
-                and description = #{description}
-            </if>
-            <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and icon = #{icon}
-            </if>
-            <if test="province != null and !&quot;&quot;.equals(province)">
-                and province = #{province}
-            </if>
-            <if test="citye != null and !&quot;&quot;.equals(citye)">
-                and citye = #{citye}
-            </if>
-            <if test="district != null and !&quot;&quot;.equals(district)">
-                and district = #{district}
-            </if>
-            <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and address_detail = #{addressDetail}
-            </if>
-            <if test="bankCard != null and !&quot;&quot;.equals(bankCard)">
-                and bank_card = #{bankCard}
-            </if>
-            <if test="bankName != null and !&quot;&quot;.equals(bankName)">
-                and bank_name = #{bankName}
-            </if>
-            <if test="openName != null and !&quot;&quot;.equals(openName)">
-                and open_name = #{openName}
-            </if>
-            <if test="credit != null and !&quot;&quot;.equals(credit)">
-                and credit = #{credit}
-            </if>
-            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-            <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
-            </if>
-            <if test="responseTime != null and !&quot;&quot;.equals(responseTime)">
-                and response_time = #{responseTime}
-            </if>
-            <if test="reworkRate != null and !&quot;&quot;.equals(reworkRate)">
-                and rework_rate = #{reworkRate}
-            </if>
-            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
-                and hot_flag = #{hotFlag}
-            </if>
-            <if test="homeFlag != null and !&quot;&quot;.equals(homeFlag)">
-                and home_flag = #{homeFlag}
-            </if>
-            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and type_flag = #{typeFlag}
-            </if>
-            <if test="subclass != null and !&quot;&quot;.equals(subclass)">
-                and subclass = #{subclass}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE store_info SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <update id="updateUseFlagByUserId">
-        UPDATE store_info
-        <set>
-            <if test="useFlag != null">
-                use_flag= #{useFlag},
-            </if>
-            <if test="typeFlag != null">
-                type_flag= #{typeFlag},
-            </if>
-        </set>
-        <where>
-            AND del_flag = 'N'
-            AND user_id = #{userId}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreInfo">
-        select
-        <include refid="Base_Column_List"/>
-        from store_info
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/StoreLabelMapper.java

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

+ 0 - 348
src/main/java/com/izouma/awesomeadmin/dao/StoreLabelMapper.xml

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

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/SystemConfigMapper.java

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

+ 0 - 459
src/main/java/com/izouma/awesomeadmin/dao/SystemConfigMapper.xml

@@ -1,459 +0,0 @@
-<?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.SystemConfigMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.SystemConfig" >
-                <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="order_rate" property="orderRate" jdbcType="VARCHAR" />
-                                <result column="tixian_rate" property="tixianRate" jdbcType="VARCHAR" />
-                                <result column="extra" property="extra" jdbcType="VARCHAR" />
-                                <result column="use_flag" property="useFlag" jdbcType="CHAR" />
-                                <result column="personal_deposit" property="personalDeposit" jdbcType="INTEGER" />
-                                <result column="company_deposit" property="companyDeposit" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            order_rate,
-
-            tixian_rate,
-
-            extra,
-
-            use_flag,
-
-            personal_deposit,
-
-            company_deposit,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from system_config
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from system_config
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.SystemConfig" useGeneratedKeys="true" keyProperty="id">
-        insert into system_config
-        <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="orderRate!= null" >
-                order_rate,
-            </if>
-                <if test="tixianRate!= null" >
-                tixian_rate,
-            </if>
-                <if test="extra!= null" >
-                extra,
-            </if>
-                <if test="useFlag!= null" >
-                use_flag,
-            </if>
-                <if test="personalDeposit!= null" >
-                personal_deposit,
-            </if>
-                <if test="companyDeposit!= null" >
-                company_deposit,
-            </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="orderRate != null" >
-                #{orderRate,jdbcType=VARCHAR},
-            </if>
-                    <if test="tixianRate != null" >
-                #{tixianRate,jdbcType=VARCHAR},
-            </if>
-                    <if test="extra != null" >
-                #{extra,jdbcType=VARCHAR},
-            </if>
-                    <if test="useFlag != null" >
-                #{useFlag,jdbcType=CHAR},
-            </if>
-                    <if test="personalDeposit != null" >
-                #{personalDeposit,jdbcType=INTEGER},
-            </if>
-                    <if test="companyDeposit != null" >
-                #{companyDeposit,jdbcType=INTEGER},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.SystemConfig" >
-        update system_config
-        <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="orderRate != null" >
-               order_rate= #{orderRate,jdbcType=VARCHAR},
-            </if>
-                     <if test="tixianRate != null" >
-               tixian_rate= #{tixianRate,jdbcType=VARCHAR},
-            </if>
-                     <if test="extra != null" >
-               extra= #{extra,jdbcType=VARCHAR},
-            </if>
-                     <if test="useFlag != null" >
-               use_flag= #{useFlag,jdbcType=CHAR},
-            </if>
-                     <if test="personalDeposit != null" >
-               personal_deposit= #{personalDeposit,jdbcType=INTEGER},
-            </if>
-                     <if test="companyDeposit != null" >
-               company_deposit= #{companyDeposit,jdbcType=INTEGER},
-            </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="querySystemConfigByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
-        <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.orderRate != null and !&quot;&quot;.equals(record.orderRate)">
-                and  order_rate = #{record.orderRate}
-            </if>
-                     <if test="record.tixianRate != null and !&quot;&quot;.equals(record.tixianRate)">
-                and  tixian_rate = #{record.tixianRate}
-            </if>
-                     <if test="record.extra != null and !&quot;&quot;.equals(record.extra)">
-                and  extra = #{record.extra}
-            </if>
-                     <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
-                and  use_flag = #{record.useFlag}
-            </if>
-                     <if test="record.personalDeposit != null and !&quot;&quot;.equals(record.personalDeposit)">
-                and  personal_deposit = #{record.personalDeposit}
-            </if>
-                     <if test="record.companyDeposit != null and !&quot;&quot;.equals(record.companyDeposit)">
-                and  company_deposit = #{record.companyDeposit}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  order_rate LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  tixian_rate LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  extra LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  use_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  personal_deposit LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  company_deposit 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="queryAllSystemConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
-        <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="orderRate != null and !&quot;&quot;.equals(orderRate)">
-                and  order_rate = #{orderRate}
-            </if>
-                    <if test="tixianRate != null and !&quot;&quot;.equals(tixianRate)">
-                and  tixian_rate = #{tixianRate}
-            </if>
-                    <if test="extra != null and !&quot;&quot;.equals(extra)">
-                and  extra = #{extra}
-            </if>
-                    <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and  use_flag = #{useFlag}
-            </if>
-                    <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
-                and  personal_deposit = #{personalDeposit}
-            </if>
-                    <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
-                and  company_deposit = #{companyDeposit}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  order_rate LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  tixian_rate LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  extra LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  use_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  personal_deposit LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  company_deposit 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="querySystemConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
-        <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="orderRate != null and !&quot;&quot;.equals(orderRate)">
-                and order_rate = #{orderRate}
-            </if>
-                     <if test="tixianRate != null and !&quot;&quot;.equals(tixianRate)">
-                and tixian_rate = #{tixianRate}
-            </if>
-                     <if test="extra != null and !&quot;&quot;.equals(extra)">
-                and extra = #{extra}
-            </if>
-                     <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and use_flag = #{useFlag}
-            </if>
-                     <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
-                and personal_deposit = #{personalDeposit}
-            </if>
-                     <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
-                and company_deposit = #{companyDeposit}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE system_config 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.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 35
src/main/java/com/izouma/awesomeadmin/dao/UserAddressMapper.java

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

+ 0 - 486
src/main/java/com/izouma/awesomeadmin/dao/UserAddressMapper.xml

@@ -1,486 +0,0 @@
-<?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.UserAddressMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.UserAddress">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="real_name" property="realName" jdbcType="VARCHAR"/>
-        <result column="telephone" property="telephone" jdbcType="VARCHAR"/>
-        <result column="postcode" property="postcode" jdbcType="VARCHAR"/>
-        <result column="address" property="address" jdbcType="VARCHAR"/>
-        <result column="address_detail" property="addressDetail" jdbcType="VARCHAR"/>
-        <result column="default_flag" property="defaultFlag" jdbcType="CHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            real_name,
-
-            telephone,
-
-            postcode,
-
-            address,
-
-            address_detail,
-
-            default_flag,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from user_address
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from user_address
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.UserAddress" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into user_address
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!= null">
-                id,
-            </if>
-            <if test="delFlag!= null">
-                del_flag,
-            </if>
-            <if test="updateTime!= null">
-                update_time,
-            </if>
-            <if test="updateUser!= null">
-                update_user,
-            </if>
-            <if test="createTime!= null">
-                create_time,
-            </if>
-            <if test="createUser!= null">
-                create_user,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="realName!= null">
-                real_name,
-            </if>
-            <if test="telephone!= null">
-                telephone,
-            </if>
-            <if test="postcode!= null">
-                postcode,
-            </if>
-            <if test="address!= null">
-                address,
-            </if>
-            <if test="addressDetail!= null">
-                address_detail,
-            </if>
-            <if test="defaultFlag!= null">
-                default_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="userId != null">
-                #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="realName != null">
-                #{realName,jdbcType=VARCHAR},
-            </if>
-            <if test="telephone != null">
-                #{telephone,jdbcType=VARCHAR},
-            </if>
-            <if test="postcode != null">
-                #{postcode,jdbcType=VARCHAR},
-            </if>
-            <if test="address != null">
-                #{address,jdbcType=VARCHAR},
-            </if>
-            <if test="addressDetail != null">
-                #{addressDetail,jdbcType=VARCHAR},
-            </if>
-            <if test="defaultFlag != null">
-                #{defaultFlag,jdbcType=CHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserAddress">
-        update user_address
-        <set>
-            <if test="id != null">
-                id= #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                user_id= #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="realName != null">
-                real_name= #{realName,jdbcType=VARCHAR},
-            </if>
-            <if test="telephone != null">
-                telephone= #{telephone,jdbcType=VARCHAR},
-            </if>
-            <if test="postcode != null">
-                postcode= #{postcode,jdbcType=VARCHAR},
-            </if>
-            <if test="address != null">
-                address= #{address,jdbcType=VARCHAR},
-            </if>
-            <if test="addressDetail != null">
-                address_detail= #{addressDetail,jdbcType=VARCHAR},
-            </if>
-            <if test="defaultFlag != null">
-                default_flag= #{defaultFlag,jdbcType=CHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryUserAddressByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.UserAddress">
-        select
-        <include refid="Base_Column_List"/>
-        from user_address
-        <where>
-            and del_flag = 'N'
-            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and id = #{record.id}
-            </if>
-            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and del_flag = #{record.delFlag}
-            </if>
-            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and update_time = #{record.updateTime}
-            </if>
-            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and update_user = #{record.updateUser}
-            </if>
-            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and create_time = #{record.createTime}
-            </if>
-            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and create_user = #{record.createUser}
-            </if>
-            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and user_id = #{record.userId}
-            </if>
-            <if test="record.realName != null and !&quot;&quot;.equals(record.realName)">
-                and real_name = #{record.realName}
-            </if>
-            <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
-                and telephone = #{record.telephone}
-            </if>
-            <if test="record.postcode != null and !&quot;&quot;.equals(record.postcode)">
-                and postcode = #{record.postcode}
-            </if>
-            <if test="record.address != null and !&quot;&quot;.equals(record.address)">
-                and address = #{record.address}
-            </if>
-            <if test="record.addressDetail != null and !&quot;&quot;.equals(record.addressDetail)">
-                and address_detail = #{record.addressDetail}
-            </if>
-            <if test="record.defaultFlag != null and !&quot;&quot;.equals(record.defaultFlag)">
-                and default_flag = #{record.defaultFlag}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR real_name LIKE concat('%',#{record.searchKey},'%')
-                    OR telephone LIKE concat('%',#{record.searchKey},'%')
-                    OR postcode LIKE concat('%',#{record.searchKey},'%')
-                    OR address LIKE concat('%',#{record.searchKey},'%')
-                    OR address_detail LIKE concat('%',#{record.searchKey},'%')
-                    OR default_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>
-        user_id , default_flag DESC , id desc
-    </select>
-    <select id="queryAllUserAddress" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.UserAddress">
-        select
-        <include refid="Base_Column_List"/>
-        from user_address
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="realName != null and !&quot;&quot;.equals(realName)">
-                and real_name = #{realName}
-            </if>
-            <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-            <if test="postcode != null and !&quot;&quot;.equals(postcode)">
-                and postcode = #{postcode}
-            </if>
-            <if test="address != null and !&quot;&quot;.equals(address)">
-                and address = #{address}
-            </if>
-            <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and address_detail = #{addressDetail}
-            </if>
-            <if test="defaultFlag != null and !&quot;&quot;.equals(defaultFlag)">
-                and default_flag = #{defaultFlag}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR real_name LIKE concat('%',#{searchKey},'%')
-                    OR telephone LIKE concat('%',#{searchKey},'%')
-                    OR postcode LIKE concat('%',#{searchKey},'%')
-                    OR address LIKE concat('%',#{searchKey},'%')
-                    OR address_detail LIKE concat('%',#{searchKey},'%')
-                    OR default_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>
-
-        user_id , default_flag DESC , id desc
-    </select>
-    <select id="queryUserAddress" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserAddress">
-        select
-        <include refid="Base_Column_List"/>
-        from user_address
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="realName != null and !&quot;&quot;.equals(realName)">
-                and real_name = #{realName}
-            </if>
-            <if test="telephone != null and !&quot;&quot;.equals(telephone)">
-                and telephone = #{telephone}
-            </if>
-            <if test="postcode != null and !&quot;&quot;.equals(postcode)">
-                and postcode = #{postcode}
-            </if>
-            <if test="address != null and !&quot;&quot;.equals(address)">
-                and address = #{address}
-            </if>
-            <if test="addressDetail != null and !&quot;&quot;.equals(addressDetail)">
-                and address_detail = #{addressDetail}
-            </if>
-            <if test="defaultFlag != null and !&quot;&quot;.equals(defaultFlag)">
-                and default_flag = #{defaultFlag}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE user_address SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <update id="setDefaultUserAddress">
-    UPDATE user_address
-    SET default_flag = CASE
-    WHEN id = #{addressId} THEN
-        'Y'
-    ELSE
-        'N'
-    END
-    WHERE
-        del_flag = 'N'
-    AND user_id = #{userId};
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserAddress">
-        select
-        <include refid="Base_Column_List"/>
-        from user_address
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/UserAgreementMapper.java

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

+ 0 - 367
src/main/java/com/izouma/awesomeadmin/dao/UserAgreementMapper.xml

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

+ 0 - 33
src/main/java/com/izouma/awesomeadmin/dao/UserCouponMapper.java

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

+ 0 - 394
src/main/java/com/izouma/awesomeadmin/dao/UserCouponMapper.xml

@@ -1,394 +0,0 @@
-<?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.UserCouponMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.UserCoupon" >
-                <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="coupon_id" property="couponId" jdbcType="VARCHAR" />
-                                <result column="user_id" property="userId" jdbcType="VARCHAR" />
-                                <result column="is_used" property="isUsed" jdbcType="CHAR" />
-                                <result column="end_time" property="endTime" jdbcType="TIMESTAMP" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            coupon_id,
-
-            user_id,
-
-            is_used,
-
-            end_time,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from user_coupon
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from user_coupon
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.UserCoupon" useGeneratedKeys="true" keyProperty="id">
-        insert into user_coupon
-        <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="couponId!= null" >
-                coupon_id,
-            </if>
-                <if test="userId!= null" >
-                user_id,
-            </if>
-                <if test="isUsed!= null" >
-                is_used,
-            </if>
-                <if test="endTime!= null" >
-                end_time,
-            </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="couponId != null" >
-                #{couponId,jdbcType=VARCHAR},
-            </if>
-                    <if test="userId != null" >
-                #{userId,jdbcType=VARCHAR},
-            </if>
-                    <if test="isUsed != null" >
-                #{isUsed,jdbcType=CHAR},
-            </if>
-                    <if test="endTime != null" >
-                #{endTime,jdbcType=TIMESTAMP},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserCoupon" >
-        update user_coupon
-        <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="couponId != null" >
-               coupon_id= #{couponId,jdbcType=VARCHAR},
-            </if>
-                     <if test="userId != null" >
-               user_id= #{userId,jdbcType=VARCHAR},
-            </if>
-                     <if test="isUsed != null" >
-               is_used= #{isUsed,jdbcType=CHAR},
-            </if>
-                     <if test="endTime != null" >
-               end_time= #{endTime,jdbcType=TIMESTAMP},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryUserCouponByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserCoupon">
-        select <include refid="Base_Column_List"/> from user_coupon
-        <where>
-            and del_flag = 'N'
-                    <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.couponId != null and !&quot;&quot;.equals(record.couponId)">
-                and  coupon_id = #{record.couponId}
-            </if>
-                     <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and  user_id = #{record.userId}
-            </if>
-                     <if test="record.isUsed != null and !&quot;&quot;.equals(record.isUsed)">
-                and  is_used = #{record.isUsed}
-            </if>
-                     <if test="record.endTime != null and !&quot;&quot;.equals(record.endTime)">
-                and  end_time = #{record.endTime}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  coupon_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  user_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  is_used LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  end_time 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="queryAllUserCoupon" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserCoupon">
-        select <include refid="Base_Column_List"/> from user_coupon
-        <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="couponId != null and !&quot;&quot;.equals(couponId)">
-                and  coupon_id = #{couponId}
-            </if>
-                    <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and  user_id = #{userId}
-            </if>
-                    <if test="isUsed != null and !&quot;&quot;.equals(isUsed)">
-                and  is_used = #{isUsed}
-            </if>
-                    <if test="endTime != null and !&quot;&quot;.equals(endTime)">
-                and  end_time = #{endTime}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  coupon_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  user_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  is_used LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  end_time 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="queryUserCoupon" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserCoupon">
-        select <include refid="Base_Column_List"/> from user_coupon
-        <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="couponId != null and !&quot;&quot;.equals(couponId)">
-                and coupon_id = #{couponId}
-            </if>
-                     <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-                     <if test="isUsed != null and !&quot;&quot;.equals(isUsed)">
-                and is_used = #{isUsed}
-            </if>
-                     <if test="endTime != null and !&quot;&quot;.equals(endTime)">
-                and end_time = #{endTime}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE user_coupon SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserCoupon">
-        select <include refid="Base_Column_List"/> from user_coupon
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 2
src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -35,8 +35,6 @@
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
         <association property="roleId" javaType="string" column="id"
         <association property="roleId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.SysRoleMapper.getUserRoleId"/>
                      select="com.izouma.awesomeadmin.dao.SysRoleMapper.getUserRoleId"/>
-        <association property="storeInfo" javaType="com.izouma.awesomeadmin.model.StoreInfo" column="{userId=id}"
-                     select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryStoreInfo"/>
     </resultMap>
     </resultMap>
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,
         id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,

+ 0 - 36
src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.java

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

+ 0 - 868
src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -1,868 +0,0 @@
-<?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.UserOrderMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.UserOrder">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="order_code" property="orderCode" jdbcType="VARCHAR"/>
-        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
-        <result column="product_type" property="productType" jdbcType="VARCHAR"/>
-        <result column="product_id" property="productId" jdbcType="INTEGER"/>
-        <result column="product_name" property="productName" jdbcType="VARCHAR"/>
-        <result column="specification" property="specification" jdbcType="VARCHAR"/>
-        <result column="unit_price" property="unitPrice" jdbcType="DECIMAL"/>
-        <result column="quantity" property="quantity" jdbcType="INTEGER"/>
-        <result column="user_coupon_id" property="userCouponId" jdbcType="INTEGER"/>
-        <result column="off_price" property="offPrice" jdbcType="DECIMAL"/>
-        <result column="totle_price" property="totlePrice" jdbcType="DECIMAL"/>
-        <result column="deal_price" property="dealPrice" jdbcType="DECIMAL"/>
-        <result column="pay_mode" property="payMode" jdbcType="INTEGER"/>
-        <result column="pay_time" property="payTime" jdbcType="TIMESTAMP"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-        <result column="show_flag" property="showFlag" jdbcType="CHAR"/>
-        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
-        <result column="fee" property="fee" jdbcType="DECIMAL"/>
-        <result column="coin" property="coin" jdbcType="DECIMAL"/>
-        <result column="point" property="point" jdbcType="DECIMAL"/>
-        <result column="cash" property="cash" jdbcType="DECIMAL"/>
-        <result column="cancel_reason" property="cancelReason" jdbcType="VARCHAR"/>
-        <result column="confirm_time" property="confirmTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <trim suffixOverrides=",">
-            id,
-
-            del_flag,
-
-            update_time,
-
-            update_user,
-
-            create_time,
-
-            create_user,
-
-            user_id,
-
-            order_code,
-
-            store_id,
-
-            product_type,
-
-            product_id,
-
-            product_name,
-
-            specification,
-
-            unit_price,
-
-            quantity,
-
-            user_coupon_id,
-
-            off_price,
-
-            totle_price,
-
-            deal_price,
-
-            pay_mode,
-
-            pay_time,
-
-            remark,
-
-            show_flag,
-
-            status_flag,
-
-            fee,
-            coin,
-            point,
-            cash,
-            cancel_reason,
-            confirm_time,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from user_order
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from user_order
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.UserOrder" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into user_order
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!= null">
-                id,
-            </if>
-            <if test="delFlag!= null">
-                del_flag,
-            </if>
-            <if test="updateTime!= null">
-                update_time,
-            </if>
-            <if test="updateUser!= null">
-                update_user,
-            </if>
-            <if test="createTime!= null">
-                create_time,
-            </if>
-            <if test="createUser!= null">
-                create_user,
-            </if>
-            <if test="userId!= null">
-                user_id,
-            </if>
-            <if test="orderCode!= null">
-                order_code,
-            </if>
-            <if test="storeId!= null">
-                store_id,
-            </if>
-            <if test="productType!= null">
-                product_type,
-            </if>
-            <if test="productId!= null">
-                product_id,
-            </if>
-            <if test="productName!= null">
-                product_name,
-            </if>
-            <if test="specification!= null">
-                specification,
-            </if>
-            <if test="unitPrice!= null">
-                unit_price,
-            </if>
-            <if test="quantity!= null">
-                quantity,
-            </if>
-            <if test="userCouponId!= null">
-                user_coupon_id,
-            </if>
-            <if test="offPrice!= null">
-                off_price,
-            </if>
-            <if test="totlePrice!= null">
-                totle_price,
-            </if>
-            <if test="dealPrice!= null">
-                deal_price,
-            </if>
-            <if test="payMode!= null">
-                pay_mode,
-            </if>
-            <if test="payTime!= null">
-                pay_time,
-            </if>
-            <if test="remark!= null">
-                remark,
-            </if>
-            <if test="showFlag!= null">
-                show_flag,
-            </if>
-            <if test="statusFlag!= null">
-                status_flag,
-            </if>
-            <if test="fee!= null">
-                fee,
-            </if>
-            <if test="coin!= null">
-                coin,
-            </if>
-            <if test="point!= null">
-                point,
-            </if>
-            <if test="cash!= null">
-                cash,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="orderCode != null">
-                #{orderCode,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=INTEGER},
-            </if>
-            <if test="productType != null">
-                #{productType,jdbcType=VARCHAR},
-            </if>
-            <if test="productId != null">
-                #{productId,jdbcType=INTEGER},
-            </if>
-            <if test="productName != null">
-                #{productName,jdbcType=VARCHAR},
-            </if>
-            <if test="specification != null">
-                #{specification,jdbcType=VARCHAR},
-            </if>
-            <if test="unitPrice != null">
-                #{unitPrice,jdbcType=DECIMAL},
-            </if>
-            <if test="quantity != null">
-                #{quantity,jdbcType=INTEGER},
-            </if>
-            <if test="userCouponId != null">
-                #{userCouponId,jdbcType=INTEGER},
-            </if>
-            <if test="offPrice != null">
-                #{offPrice,jdbcType=DECIMAL},
-            </if>
-            <if test="totlePrice != null">
-                #{totlePrice,jdbcType=DECIMAL},
-            </if>
-            <if test="dealPrice != null">
-                #{dealPrice,jdbcType=DECIMAL},
-            </if>
-            <if test="payMode != null">
-                #{payMode,jdbcType=INTEGER},
-            </if>
-            <if test="payTime != null">
-                #{payTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="remark != null">
-                #{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="showFlag != null">
-                #{showFlag,jdbcType=CHAR},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="fee != null">
-                #{fee,jdbcType=DECIMAL},
-            </if>
-            <if test="coin != null">
-                #{coin,jdbcType=DECIMAL},
-            </if>
-            <if test="point != null">
-                #{point,jdbcType=DECIMAL},
-            </if>
-            <if test="cash != null">
-                #{cash,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserOrder">
-        update user_order
-        <set>
-            <if test="id != null">
-                id= #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="updateTime != null">
-                update_time= #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUser != null">
-                update_user= #{updateUser,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time= #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createUser != null">
-                create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                user_id= #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="orderCode != null">
-                order_code= #{orderCode,jdbcType=VARCHAR},
-            </if>
-            <if test="storeId != null">
-                store_id= #{storeId,jdbcType=INTEGER},
-            </if>
-            <if test="productType != null">
-                product_type= #{productType,jdbcType=VARCHAR},
-            </if>
-            <if test="productId != null">
-                product_id= #{productId,jdbcType=INTEGER},
-            </if>
-            <if test="productName != null">
-                product_name= #{productName,jdbcType=VARCHAR},
-            </if>
-            <if test="specification != null">
-                specification= #{specification,jdbcType=VARCHAR},
-            </if>
-            <if test="unitPrice != null">
-                unit_price= #{unitPrice,jdbcType=DECIMAL},
-            </if>
-            <if test="quantity != null">
-                quantity= #{quantity,jdbcType=INTEGER},
-            </if>
-            <if test="userCouponId != null">
-                user_coupon_id= #{userCouponId,jdbcType=INTEGER},
-            </if>
-            <if test="offPrice != null">
-                off_price= #{offPrice,jdbcType=DECIMAL},
-            </if>
-            <if test="totlePrice != null">
-                totle_price= #{totlePrice,jdbcType=DECIMAL},
-            </if>
-            <if test="dealPrice != null">
-                deal_price= #{dealPrice,jdbcType=DECIMAL},
-            </if>
-            <if test="payMode != null">
-                pay_mode= #{payMode,jdbcType=INTEGER},
-            </if>
-            <if test="payTime != null">
-                pay_time= #{payTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="remark != null">
-                remark= #{remark,jdbcType=VARCHAR},
-            </if>
-            <if test="showFlag != null">
-                show_flag= #{showFlag,jdbcType=CHAR},
-            </if>
-            <if test="statusFlag != null">
-                status_flag= #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="fee != null">
-                fee= #{fee,jdbcType=DECIMAL},
-            </if>
-            <if test="coin != null">
-                coin= #{coin,jdbcType=DECIMAL},
-            </if>
-            <if test="point != null">
-                point= #{point,jdbcType=DECIMAL},
-            </if>
-            <if test="cash != null">
-                cash= #{cash,jdbcType=DECIMAL},
-            </if>
-            <if test="cancelReason != null">
-                cancel_reason= #{cancelReason},
-            </if>
-            <if test="confirmTime != null">
-                confirm_time= #{confirmTime,jdbcType=TIMESTAMP},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryUserOrderByPage" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
-        select
-        <include refid="Base_Column_List"/>,(SELECT
-        COUNT(1)
-        FROM
-        product_comment
-        WHERE
-        product_comment.del_flag = 'N'
-        AND product_comment.order_id = user_order.id
-        AND product_comment.type_flag = 1) as commentFlag
-        from user_order
-        <where>
-            and del_flag = 'N'
-            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and id = #{record.id}
-            </if>
-            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and del_flag = #{record.delFlag}
-            </if>
-            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and update_time = #{record.updateTime}
-            </if>
-            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and update_user = #{record.updateUser}
-            </if>
-            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and create_time = #{record.createTime}
-            </if>
-            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and create_user = #{record.createUser}
-            </if>
-            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
-                and user_id = #{record.userId}
-            </if>
-            <if test="record.orderCode != null and !&quot;&quot;.equals(record.orderCode)">
-                and order_code = #{record.orderCode}
-            </if>
-            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
-                and store_id = #{record.storeId}
-            </if>
-            <if test="record.productType != null and !&quot;&quot;.equals(record.productType)">
-                and product_type = #{record.productType}
-            </if>
-            <if test="record.productId != null and !&quot;&quot;.equals(record.productId)">
-                and product_id = #{record.productId}
-            </if>
-            <if test="record.productName != null and !&quot;&quot;.equals(record.productName)">
-                and product_name = #{record.productName}
-            </if>
-            <if test="record.specification != null and !&quot;&quot;.equals(record.specification)">
-                and specification = #{record.specification}
-            </if>
-            <if test="record.unitPrice != null and !&quot;&quot;.equals(record.unitPrice)">
-                and unit_price = #{record.unitPrice}
-            </if>
-            <if test="record.quantity != null and !&quot;&quot;.equals(record.quantity)">
-                and quantity = #{record.quantity}
-            </if>
-            <if test="record.userCouponId != null and !&quot;&quot;.equals(record.userCouponId)">
-                and user_coupon_id = #{record.userCouponId}
-            </if>
-            <if test="record.offPrice != null and !&quot;&quot;.equals(record.offPrice)">
-                and off_price = #{record.offPrice}
-            </if>
-            <if test="record.totlePrice != null and !&quot;&quot;.equals(record.totlePrice)">
-                and totle_price = #{record.totlePrice}
-            </if>
-            <if test="record.dealPrice != null and !&quot;&quot;.equals(record.dealPrice)">
-                and deal_price = #{record.dealPrice}
-            </if>
-            <if test="record.payMode != null and !&quot;&quot;.equals(record.payMode)">
-                and pay_mode = #{record.payMode}
-            </if>
-            <if test="record.payTime != null and !&quot;&quot;.equals(record.payTime)">
-                and pay_time = #{record.payTime}
-            </if>
-            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and remark = #{record.remark}
-            </if>
-            <if test="record.showFlag != null and !&quot;&quot;.equals(record.showFlag)">
-                and show_flag = #{record.showFlag}
-            </if>
-            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and status_flag = #{record.statusFlag}
-            </if>
-            <if test="record.statusStr != null and !&quot;&quot;.equals(record.statusStr)">
-                and status_flag in (${record.statusStr})
-            </if>
-            <if test="record.fee != null and !&quot;&quot;.equals(record.fee)">
-                and fee = #{record.fee}
-            </if>
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{record.searchKey},'%')
-                    OR order_code LIKE concat('%',#{record.searchKey},'%')
-                    OR store_id LIKE concat('%',#{record.searchKey},'%')
-                    OR product_type LIKE concat('%',#{record.searchKey},'%')
-                    OR product_id LIKE concat('%',#{record.searchKey},'%')
-                    OR product_name LIKE concat('%',#{record.searchKey},'%')
-                    OR specification LIKE concat('%',#{record.searchKey},'%')
-                    OR unit_price LIKE concat('%',#{record.searchKey},'%')
-                    OR quantity LIKE concat('%',#{record.searchKey},'%')
-                    OR user_coupon_id LIKE concat('%',#{record.searchKey},'%')
-                    OR off_price LIKE concat('%',#{record.searchKey},'%')
-                    OR totle_price LIKE concat('%',#{record.searchKey},'%')
-                    OR deal_price LIKE concat('%',#{record.searchKey},'%')
-                    OR pay_mode LIKE concat('%',#{record.searchKey},'%')
-                    OR pay_time LIKE concat('%',#{record.searchKey},'%')
-                    OR remark LIKE concat('%',#{record.searchKey},'%')
-                    OR show_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
-                    OR fee 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="queryAllUserOrder" parameterType="java.util.Map" resultMap="AllUserOrderResult">
-        select
-        <include refid="Base_Column_List"/>
-        from user_order
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="orderCode != null and !&quot;&quot;.equals(orderCode)">
-                and order_code = #{orderCode}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="productType != null and !&quot;&quot;.equals(productType)">
-                and product_type = #{productType}
-            </if>
-            <if test="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </if>
-            <if test="productName != null and !&quot;&quot;.equals(productName)">
-                and product_name = #{productName}
-            </if>
-            <if test="specification != null and !&quot;&quot;.equals(specification)">
-                and specification = #{specification}
-            </if>
-            <if test="unitPrice != null and !&quot;&quot;.equals(unitPrice)">
-                and unit_price = #{unitPrice}
-            </if>
-            <if test="quantity != null and !&quot;&quot;.equals(quantity)">
-                and quantity = #{quantity}
-            </if>
-            <if test="userCouponId != null and !&quot;&quot;.equals(userCouponId)">
-                and user_coupon_id = #{userCouponId}
-            </if>
-            <if test="offPrice != null and !&quot;&quot;.equals(offPrice)">
-                and off_price = #{offPrice}
-            </if>
-            <if test="totlePrice != null and !&quot;&quot;.equals(totlePrice)">
-                and totle_price = #{totlePrice}
-            </if>
-            <if test="dealPrice != null and !&quot;&quot;.equals(dealPrice)">
-                and deal_price = #{dealPrice}
-            </if>
-            <if test="payMode != null and !&quot;&quot;.equals(payMode)">
-                and pay_mode = #{payMode}
-            </if>
-            <if test="payTime != null and !&quot;&quot;.equals(payTime)">
-                and pay_time = #{payTime}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="showFlag != null and !&quot;&quot;.equals(showFlag)">
-                and show_flag = #{showFlag}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="statusStr != null and !&quot;&quot;.equals(statusStr)">
-                and status_flag in (${statusStr})
-            </if>
-            <if test="fee != null and !&quot;&quot;.equals(fee)">
-                and fee = #{fee}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR">
-                    OR user_id LIKE concat('%',#{searchKey},'%')
-                    OR order_code LIKE concat('%',#{searchKey},'%')
-                    OR store_id LIKE concat('%',#{searchKey},'%')
-                    OR product_type LIKE concat('%',#{searchKey},'%')
-                    OR product_id LIKE concat('%',#{searchKey},'%')
-                    OR product_name LIKE concat('%',#{searchKey},'%')
-                    OR specification LIKE concat('%',#{searchKey},'%')
-                    OR unit_price LIKE concat('%',#{searchKey},'%')
-                    OR quantity LIKE concat('%',#{searchKey},'%')
-                    OR user_coupon_id LIKE concat('%',#{searchKey},'%')
-                    OR off_price LIKE concat('%',#{searchKey},'%')
-                    OR totle_price LIKE concat('%',#{searchKey},'%')
-                    OR deal_price LIKE concat('%',#{searchKey},'%')
-                    OR pay_mode LIKE concat('%',#{searchKey},'%')
-                    OR pay_time LIKE concat('%',#{searchKey},'%')
-                    OR remark LIKE concat('%',#{searchKey},'%')
-                    OR show_flag LIKE concat('%',#{searchKey},'%')
-                    OR status_flag LIKE concat('%',#{searchKey},'%')
-                    OR fee 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
-        <if test="limitNum != null and !&quot;&quot;.equals(limitNum)">
-            LIMIT #{limitNum}
-        </if>
-    </select>
-    <select id="queryUserOrder" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
-        select
-        <include refid="Base_Column_List"/>,(SELECT
-        COUNT(1)
-        FROM
-        product_comment
-        WHERE
-        product_comment.del_flag = 'N'
-        AND product_comment.order_id = user_order.id
-        AND product_comment.type_flag = 1) as commentFlag
-        from user_order
-        <where>
-            and del_flag = 'N'
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
-            </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
-            </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
-            </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
-            </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id = #{userId}
-            </if>
-            <if test="orderCode != null and !&quot;&quot;.equals(orderCode)">
-                and order_code = #{orderCode}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id = #{storeId}
-            </if>
-            <if test="productType != null and !&quot;&quot;.equals(productType)">
-                and product_type = #{productType}
-            </if>
-            <if test="productId != null and !&quot;&quot;.equals(productId)">
-                and product_id = #{productId}
-            </if>
-            <if test="productName != null and !&quot;&quot;.equals(productName)">
-                and product_name = #{productName}
-            </if>
-            <if test="specification != null and !&quot;&quot;.equals(specification)">
-                and specification = #{specification}
-            </if>
-            <if test="unitPrice != null and !&quot;&quot;.equals(unitPrice)">
-                and unit_price = #{unitPrice}
-            </if>
-            <if test="quantity != null and !&quot;&quot;.equals(quantity)">
-                and quantity = #{quantity}
-            </if>
-            <if test="userCouponId != null and !&quot;&quot;.equals(userCouponId)">
-                and user_coupon_id = #{userCouponId}
-            </if>
-            <if test="offPrice != null and !&quot;&quot;.equals(offPrice)">
-                and off_price = #{offPrice}
-            </if>
-            <if test="totlePrice != null and !&quot;&quot;.equals(totlePrice)">
-                and totle_price = #{totlePrice}
-            </if>
-            <if test="dealPrice != null and !&quot;&quot;.equals(dealPrice)">
-                and deal_price = #{dealPrice}
-            </if>
-            <if test="payMode != null and !&quot;&quot;.equals(payMode)">
-                and pay_mode = #{payMode}
-            </if>
-            <if test="payTime != null and !&quot;&quot;.equals(payTime)">
-                and pay_time = #{payTime}
-            </if>
-            <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-            <if test="showFlag != null and !&quot;&quot;.equals(showFlag)">
-                and show_flag = #{showFlag}
-            </if>
-            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and status_flag = #{statusFlag}
-            </if>
-            <if test="fee != null and !&quot;&quot;.equals(fee)">
-                and fee = #{fee}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE user_order SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserOrder">
-        select
-        <include refid="Base_Column_List"/>
-        from user_order
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-
-    <select id="getAutoCancel" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserOrder">
-        select
-        <include refid="Base_Column_List"/>
-        from user_order
-        <where>
-            and del_flag = 'N'
-            and status_flag = 0
-            <![CDATA[AND create_time < DATE_ADD(NOW(),INTERVAL -30 MINUTE)]]>
-        </where>
-        order by id desc
-    </select>
-
-    <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.UserOrder" extends="BaseResultMap">
-
-
-        <association property="userInfo"
-                     javaType="com.izouma.awesomeadmin.model.UserInfo"
-                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo"
-                     column="{ id = user_id }"/>
-
-        <association property="productInfo"
-                     javaType="com.izouma.awesomeadmin.model.ProductInfo"
-                     select="com.izouma.awesomeadmin.dao.ProductInfoMapper.queryProductInfo"
-                     column="{ id = product_id }"/>
-
-        <association property="orderAddress"
-                     javaType="com.izouma.awesomeadmin.model.OrderAddress"
-                     select="com.izouma.awesomeadmin.dao.OrderAddressMapper.queryOrderAddress"
-                     column="{ orderId = id }"/>
-
-        <association property="productComment"
-                     javaType="com.izouma.awesomeadmin.model.ProductComment"
-                     select="com.izouma.awesomeadmin.dao.ProductCommentMapper.getCount"
-                     column="{ userId = user_id }"/>
-
-        <collection property="orderRepairList"
-                    ofType="com.izouma.awesomeadmin.model.OrderRepair"
-                    select="com.izouma.awesomeadmin.dao.OrderRepairMapper.queryAllOrderRepair"
-                    column="{ orderId = id }"/>
-
-    </resultMap>
-
-    <resultMap id="AllUserOrderResult" type="com.izouma.awesomeadmin.model.UserOrder" extends="BaseResultMap">
-
-
-        <association property="userInfo"
-                     javaType="com.izouma.awesomeadmin.model.UserInfo"
-                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo"
-                     column="{ id = user_id }"/>
-
-    </resultMap>
-
-
-</mapper>
-

+ 0 - 49
src/main/java/com/izouma/awesomeadmin/dao/UsersSessionMapper.java

@@ -1,49 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import com.izouma.awesomeadmin.model.ChatInfo;
-import com.izouma.awesomeadmin.model.UsersSession;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Repository("com.izouma.awesomeadmin.dao.UsersSessionMapper")
-public interface UsersSessionMapper {
-
-    int deleteByPrimaryKey(Integer id);
-
-
-    int insert(UsersSession record);
-
-
-    int insertSelective(UsersSession record);
-
-
-    UsersSession selectByPrimaryKey(Integer id);
-
-
-    int updateByPrimaryKeySelective(UsersSession record);
-
-
-    int updateByPrimaryKey(UsersSession record);
-
-
-    List<UsersSession> queryAllUsersSession(Map<String, Object> parameter);
-
-
-    List<UsersSession> queryAllUsersSessionByPage(Map<String, Object> parameter);
-
-
-    List<UsersSession> queryUsersSessionsByPage(Map<String, Object> parameter);
-
-    List<UsersSession> queryUsersSessionList(UsersSession record);
-
-
-    int delete(String id);
-
-
-    UsersSession queryUsersSession(UsersSession usersSession);
-
-    int updateByChatInfo(ChatInfo chatInfo);
-
-}

+ 0 - 403
src/main/java/com/izouma/awesomeadmin/dao/UsersSessionMapper.xml

@@ -1,403 +0,0 @@
-<?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.UsersSessionMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.UsersSession">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="to_user_id" property="toUserId" jdbcType="INTEGER"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="type" property="type" jdbcType="INTEGER"/>
-        <result column="project_id" property="projectId" jdbcType="INTEGER"/>
-        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="contact_id" property="contactId" jdbcType="INTEGER"/>
-        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        id, user_id, to_user_id, create_time, update_time, type, project_id, del_flag, contact_id, store_id
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from users_session
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        DELETE FROM users_session
-        WHERE id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insert" parameterType="com.izouma.awesomeadmin.model.UsersSession" useGeneratedKeys="true"
-            keyProperty="id">
-        INSERT INTO users_session (id, user_id, to_user_id,
-                                   create_time, update_time, type,
-                                   project_id, del_flag, contact_id, store_id)
-        VALUES (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{toUserId,jdbcType=INTEGER},
-                #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER},
-                #{projectId,jdbcType=INTEGER}, #{delFlag,jdbcType=CHAR}, #{contactId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER})
-    </insert>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.UsersSession" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into users_session
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="userId != null">
-                user_id,
-            </if>
-            <if test="toUserId != null">
-                to_user_id,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-            <if test="type != null">
-                type,
-            </if>
-            <if test="projectId != null">
-                project_id,
-            </if>
-            <if test="delFlag != null">
-                del_flag,
-            </if>
-            <if test="contactId != null">
-                contact_id,
-            </if>
-            <if test="storeId != null">
-                store_id,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="toUserId != null">
-                #{toUserId,jdbcType=INTEGER},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="type != null">
-                #{type,jdbcType=INTEGER},
-            </if>
-            <if test="projectId != null">
-                #{projectId,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="contactId != null">
-                #{contactId,jdbcType=INTEGER},
-            </if>
-            <if test="storeId != null">
-                #{storeId,jdbcType=INTEGER},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UsersSession">
-        update users_session
-        <set>
-            <if test="userId != null">
-                user_id = #{userId,jdbcType=INTEGER},
-            </if>
-            <if test="toUserId != null">
-                to_user_id = #{toUserId,jdbcType=INTEGER},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="type != null">
-                type = #{type,jdbcType=INTEGER},
-            </if>
-            <if test="projectId != null">
-                project_id = #{projectId,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null">
-                del_flag = #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="storeId != null">
-                store_id = #{storeId,jdbcType=INTEGER},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="com.izouma.awesomeadmin.model.UsersSession">
-        UPDATE users_session
-        SET user_id     = #{userId,jdbcType=INTEGER},
-            to_user_id  = #{toUserId,jdbcType=INTEGER},
-            create_time = #{createTime,jdbcType=TIMESTAMP},
-            update_time = #{updateTime,jdbcType=TIMESTAMP},
-            type        = #{type,jdbcType=INTEGER},
-            project_id  = #{projectId,jdbcType=INTEGER},
-            del_flag    = #{delFlag,jdbcType=CHAR}
-        WHERE id = #{id,jdbcType=INTEGER}
-    </update>
-
-    <update id="updateByChatInfo" parameterType="com.izouma.awesomeadmin.model.ChatInfo">
-        UPDATE users_session
-        SET update_time = NOW()
-        WHERE
-            del_flag = 'N'
-        AND user_id = #{userId}
-        AND store_id = #{storeId}
-    </update>
-
-
-    <select id="queryUsersSessionsByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.UsersSession">
-        select
-        <include refid="Base_Column_List"/>
-        from users_session
-        <where>
-            and del_flag = 'N'
-
-            <if test="usersSession.id != null and !&quot;&quot;.equals(usersSession.id)">
-                and id=#{UsersSession.id}
-            </if>
-            <if test="usersSession.userId != null and !&quot;&quot;.equals(usersSession.userId)">
-                and user_id=#{usersSession.userId}
-            </if>
-            <if test="usersSession.toUserId != null and !&quot;&quot;.equals(usersSession.toUserId)">
-                and to_user_id=#{usersSession.toUserId}
-            </if>
-            <if test="usersSession.type != null and !&quot;&quot;.equals(usersSession.type)">
-                and type=#{usersSession.type}
-            </if>
-            <if test="usersSession.projectId != null and !&quot;&quot;.equals(usersSession.projectId)">
-                and project_id=#{usersSession.projectId}
-            </if>
-            <if test="usersSession.storeId != null and !&quot;&quot;.equals(usersSession.storeId)">
-                and store_id=#{usersSession.storeId}
-            </if>
-        </where>
-        order by update_time desc
-    </select>
-
-    <select id="queryUsersSessionList" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.UsersSession">
-        select
-        <include refid="Base_Column_List"/>
-        from users_session
-        <where>
-            and del_flag = 'N'
-
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id=#{userId}
-            </if>
-            <if test="type != null and !&quot;&quot;.equals(type)">
-                and type=#{type}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id=#{storeId}
-            </if>
-        </where>
-        order by update_time desc
-    </select>
-
-
-    <select id="queryAllUsersSession" parameterType="java.util.Map" resultMap="UsersSessionResultMap">
-        SELECT DISTINCT
-        us.id,
-        us.user_id,
-        us.type,
-        us.store_id,
-        MAX(us.update_time) update_time,
-        COUNT(chat.id) AS amount
-        FROM
-        users_session us
-        LEFT JOIN chat_info chat ON chat.user_id = us.user_id
-        AND chat.store_id = us.store_id
-        AND chat.type_flag = us.type
-        AND chat.state = 0
-        WHERE
-        us.user_id != 1
-
-        AND us.store_id IN (
-        SELECT
-        id
-        FROM
-        store_info
-        WHERE
-        del_flag = 'N'
-        )
-        AND us.del_flag = 'N'
-
-        <if test="userId != null and !&quot;&quot;.equals(userId)">
-            AND us.user_id = #{userId}
-        </if>
-        <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-            AND us.store_id = #{storeId}
-        </if>
-        <if test="type != null and !&quot;&quot;.equals(type)">
-            AND us.type = #{type}
-        </if>
-        <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
-            <![CDATA[ and  us.update_time >= #{beginTime}]]>
-        </if>
-
-        <if test="endTime != null and !&quot;&quot;.equals(endTime)">
-            <![CDATA[ and   us.update_time <= #{endTime}]]>
-        </if>
-
-        GROUP BY
-        us.id,
-        us.user_id,
-        us.type,
-        us.store_id
-        ORDER BY
-        update_time DESC
-    </select>
-
-
-    <select id="queryAllUsersSessionByPage" parameterType="java.util.Map" resultMap="UsersSessionResultMap">
-
-        SELECT DISTINCT
-        us.id,
-        us.user_id,
-        us.type,
-        us.store_id,
-        MAX(us.update_time) update_time,
-        COUNT(chat.id) AS amount
-        FROM
-        users_session us
-        LEFT JOIN chat_info chat ON chat.user_id = us.user_id
-        AND chat.store_id = us.store_id
-        AND chat.type_flag = us.type
-        AND chat.state = 0
-        WHERE
-        us.user_id != 1
-
-        AND us.store_id IN (
-        SELECT
-        id
-        FROM
-        store_info
-        WHERE
-        del_flag = 'N'
-        )
-        AND us.del_flag = 'N'
-
-        <if test="userId != null and !&quot;&quot;.equals(userId)">
-            AND us.user_id = #{userId}
-        </if>
-        <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-            AND us.store_id = #{storeId}
-        </if>
-        <if test="type != null and !&quot;&quot;.equals(type)">
-            AND us.type = #{type}
-        </if>
-        <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
-            <![CDATA[ and  us.update_time >= #{beginTime}]]>
-        </if>
-
-        <if test="endTime != null and !&quot;&quot;.equals(endTime)">
-            <![CDATA[ and   us.update_time <= #{endTime}]]>
-        </if>
-
-        GROUP BY
-        us.id,
-        us.user_id,
-        us.type,
-        us.store_id
-        ORDER BY
-        update_time DESC
-
-    </select>
-
-    <select id="queryUsersSession" parameterType="com.izouma.awesomeadmin.model.UsersSession"
-            resultType="com.izouma.awesomeadmin.model.UsersSession">
-        select
-        <include refid="Base_Column_List"/>
-        from users_session
-        <where>
-            and del_flag = 'N'
-
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id=#{id}
-            </if>
-            <if test="userId != null and !&quot;&quot;.equals(userId)">
-                and user_id=#{userId}
-            </if>
-            <if test="toUserId != null and !&quot;&quot;.equals(toUserId)">
-                and to_user_id=#{toUserId}
-            </if>
-            <if test="type != null and !&quot;&quot;.equals(type)">
-                and type=#{type}
-            </if>
-            <if test="projectId != null and !&quot;&quot;.equals(projectId)">
-                and project_id=#{projectId}
-            </if>
-            <if test="contactId != null and !&quot;&quot;.equals(contactId)">
-                and contact_id=#{contactId}
-            </if>
-            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-                and store_id=#{storeId}
-            </if>
-        </where>
-        LIMIT 1
-    </select>
-
-
-    <update id="delete">
-        UPDATE users_session SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-
-
-    <select id="getChat" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ChatInfo">
-        SELECT *
-        FROM
-        chat_info
-        WHERE
-        user_id = #{userId}
-        AND state != 2
-        <if test="storeId != null and !&quot;&quot;.equals(storeId)">
-            AND store_id = #{storeId}
-        </if>
-        ORDER BY
-        time DESC
-        LIMIT 1
-    </select>
-
-    <resultMap id="UsersSessionResultMap" type="com.izouma.awesomeadmin.model.UsersSession">
-
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="to_user_id" property="toUserId" jdbcType="INTEGER"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="type" property="type" jdbcType="INTEGER"/>
-        <result column="project_id" property="projectId" jdbcType="INTEGER"/>
-        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
-        <result column="chattime" property="chattime"/>
-        <association
-                property="chatInfo" javaType="com.izouma.awesomeadmin.model.ChatInfo"
-                select="getChat"
-                column="{ userId = user_id , storeId = store_id}"/>
-        <association property="storeInfo"
-                     javaType="com.izouma.awesomeadmin.model.StoreInfo"
-                     select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryStoreInfo"
-                     column="{ id = store_id }"/>
-        <association property="userInfo"
-                     javaType="com.izouma.awesomeadmin.model.UserInfo"
-                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo"
-                     column="{ id = user_id }"/>
-
-    </resultMap>
-
-
-</mapper>

+ 0 - 122
src/main/java/com/izouma/awesomeadmin/model/AboutUs.java

@@ -1,122 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class AboutUs{
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private String title;
-    private String description;
-    private String image;
-
-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 getTitle(){
-        return this.title;
-    }
-
-    public void setTitle(String title){
-        this.title = title;
-    }
-    public String getDescription(){
-        return this.description;
-    }
-
-    public void setDescription(String description){
-        this.description = description;
-    }
-    public String getImage(){
-        return this.image;
-    }
-
-    public void setImage(String image){
-        this.image = image;
-    }
-
-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;
-}
-
-}
-

+ 0 - 146
src/main/java/com/izouma/awesomeadmin/model/BannerInfo.java

@@ -1,146 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class BannerInfo{
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private String location;
-    private String title;
-    private String subtitle;
-    private String url;
-    private String imageUrl;
-    private Integer rank;
-
-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 getLocation(){
-        return this.location;
-    }
-
-    public void setLocation(String location){
-        this.location = location;
-    }
-    public String getTitle(){
-        return this.title;
-    }
-
-    public void setTitle(String title){
-        this.title = title;
-    }
-    public String getSubtitle(){
-        return this.subtitle;
-    }
-
-    public void setSubtitle(String subtitle){
-        this.subtitle = subtitle;
-    }
-    public String getUrl(){
-        return this.url;
-    }
-
-    public void setUrl(String url){
-        this.url = url;
-    }
-    public String getImageUrl(){
-        return this.imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl){
-        this.imageUrl = imageUrl;
-    }
-    public Integer getRank(){
-        return this.rank;
-    }
-
-    public void setRank(Integer rank){
-        this.rank = rank;
-    }
-
-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;
-}
-
-}
-

+ 0 - 220
src/main/java/com/izouma/awesomeadmin/model/ChatInfo.java

@@ -1,220 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import java.util.Date;
-
-@JsonAutoDetect
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-public class ChatInfo {
-
-    private Integer id;
-
-    private Integer userId;
-
-    private Integer toUserId;
-
-    private String content;
-
-    private Date time;
-
-    private Integer contentType;
-
-    private Integer state;
-
-    private String nickName;
-
-    private String icon;
-
-    private Integer projectId;
-
-    private String formId;
-
-    private Integer storeId;
-
-    private Integer typeFlag;
-
-    private String serviceName;
-
-    private String serviceNick;
-
-    private String serviceIcon;
-
-
-    public String getFormId() {
-        return formId;
-    }
-
-    public void setFormId(String formId) {
-        this.formId = formId;
-    }
-
-    public Integer getId() {
-
-        return id;
-    }
-
-
-    public void setId(Integer id) {
-
-        this.id = id;
-    }
-
-
-    public Integer getUserId() {
-
-        return userId;
-    }
-
-
-    public void setUserId(Integer userId) {
-
-        this.userId = userId;
-    }
-
-
-    public Integer getToUserId() {
-
-        return toUserId;
-    }
-
-
-    public void setToUserId(Integer toUserId) {
-
-        this.toUserId = toUserId;
-    }
-
-
-    public String getContent() {
-
-        return content;
-    }
-
-
-    public void setContent(String content) {
-
-        this.content = content;
-    }
-
-
-    public Date getTime() {
-
-        return time;
-    }
-
-
-    public void setTime(Date time) {
-
-        this.time = time;
-    }
-
-
-    public Integer getContentType() {
-
-        return contentType;
-    }
-
-
-    public void setContentType(Integer contentType) {
-
-        this.contentType = contentType;
-    }
-
-
-    public Integer getState() {
-
-        return state;
-    }
-
-
-    public void setState(Integer state) {
-
-        this.state = state;
-    }
-
-
-    public String getNickName() {
-
-        return nickName;
-    }
-
-
-    public void setNickName(String nickName) {
-
-        this.nickName = nickName;
-    }
-
-
-    public String getIcon() {
-
-        return icon;
-    }
-
-
-    public void setIcon(String icon) {
-
-        this.icon = icon;
-    }
-
-
-    public Integer getProjectId() {
-
-        return projectId;
-    }
-
-
-    public void setProjectId(Integer projectId) {
-
-        this.projectId = projectId;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public Integer getTypeFlag() {
-        return typeFlag;
-    }
-
-    public void setTypeFlag(Integer typeFlag) {
-        this.typeFlag = typeFlag;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    public String getServiceNick() {
-        return serviceNick;
-    }
-
-    public void setServiceNick(String serviceNick) {
-        this.serviceNick = serviceNick;
-    }
-
-    public String getServiceIcon() {
-        return serviceIcon;
-    }
-
-    public void setServiceIcon(String serviceIcon) {
-        this.serviceIcon = serviceIcon;
-    }
-
-    @Override
-    public String toString() {
-
-        return "ChatInfo [id=" + id + ", userId=" + userId + ", toUserId=" + toUserId + ", content=" + content + ", time=" + time + ", contentType="
-                + contentType + ", state=" + state + ", nickName=" + nickName + ", icon=" + icon + ", projectId=" + projectId + "]";
-    }
-
-}

+ 0 - 202
src/main/java/com/izouma/awesomeadmin/model/CompanyAuthentication.java

@@ -1,202 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CompanyAuthentication{
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private Integer userId;
-    private String userName;
-    private String company;
-    private String companyTime;
-    private String businessNo;
-    private String certificate;
-    private String province;
-    private String city;
-    private String country;
-    private Integer statusFlag;
-    private String telephone;
-    private String realName;
-    private String remark;
-
-private String searchKey;
-
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
-
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
-
-    public Integer getId(){
-        return this.id;
-    }
-
-    public void setId(Integer id){
-        this.id = id;
-    }
-    public String getDelFlag(){
-        return this.delFlag;
-    }
-
-    public void setDelFlag(String delFlag){
-        this.delFlag = delFlag;
-    }
-    public Date getUpdateTime(){
-        return this.updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime){
-        this.updateTime = updateTime;
-    }
-    public String getUpdateUser(){
-        return this.updateUser;
-    }
-
-    public void setUpdateUser(String updateUser){
-        this.updateUser = updateUser;
-    }
-    public Date getCreateTime(){
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date createTime){
-        this.createTime = createTime;
-    }
-    public String getCreateUser(){
-        return this.createUser;
-    }
-
-    public void setCreateUser(String createUser){
-        this.createUser = createUser;
-    }
-    public Integer getUserId(){
-        return this.userId;
-    }
-
-    public void setUserId(Integer userId){
-        this.userId = userId;
-    }
-    public String getUserName(){
-        return this.userName;
-    }
-
-    public void setUserName(String userName){
-        this.userName = userName;
-    }
-    public String getCompany(){
-        return this.company;
-    }
-
-    public void setCompany(String company){
-        this.company = company;
-    }
-    public String getCompanyTime(){
-        return this.companyTime;
-    }
-
-    public void setCompanyTime(String companyTime){
-        this.companyTime = companyTime;
-    }
-    public String getBusinessNo(){
-        return this.businessNo;
-    }
-
-    public void setBusinessNo(String businessNo){
-        this.businessNo = businessNo;
-    }
-    public String getCertificate(){
-        return this.certificate;
-    }
-
-    public void setCertificate(String certificate){
-        this.certificate = certificate;
-    }
-    public String getProvince(){
-        return this.province;
-    }
-
-    public void setProvince(String province){
-        this.province = province;
-    }
-    public String getCity(){
-        return this.city;
-    }
-
-    public void setCity(String city){
-        this.city = city;
-    }
-    public String getCountry(){
-        return this.country;
-    }
-
-    public void setCountry(String country){
-        this.country = country;
-    }
-    public Integer getStatusFlag(){
-        return this.statusFlag;
-    }
-
-    public void setStatusFlag(Integer statusFlag){
-        this.statusFlag = statusFlag;
-    }
-    public String getTelephone(){
-        return this.telephone;
-    }
-
-    public void setTelephone(String telephone){
-        this.telephone = telephone;
-    }
-    public String getRealName(){
-        return this.realName;
-    }
-
-    public void setRealName(String realName){
-        this.realName = realName;
-    }
-    public String getRemark(){
-        return this.remark;
-    }
-
-    public void setRemark(String remark){
-        this.remark = remark;
-    }
-
-public String getSearchKey() {
-    return searchKey;
-}
-
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
-
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
-
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
-
-public String getOrderByStr() {
-    return orderByStr;
-}
-
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
-
-}
-

+ 0 - 132
src/main/java/com/izouma/awesomeadmin/model/CompanyType.java

@@ -1,132 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CompanyType{
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private String typeName;
-    private String remark;
-    private Integer rank;
-
-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 getTypeName(){
-        return this.typeName;
-    }
-
-    public void setTypeName(String typeName){
-        this.typeName = typeName;
-    }
-    public String getRemark(){
-        return this.remark;
-    }
-
-    public void setRemark(String remark){
-        this.remark = remark;
-    }
-    public Integer getRank(){
-        return this.rank;
-    }
-
-    public void setRank(Integer rank){
-        this.rank = rank;
-    }
-
-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;
-}
-
-}
-

+ 0 - 169
src/main/java/com/izouma/awesomeadmin/model/ContactUs.java

@@ -1,169 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ContactUs {
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private String companyName;
-    private String telephone;
-    private String faxes;
-    private String postcode;
-    private String address;
-
-    private String serviceTime;
-
-    private String servicePhone;
-
-
-    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 getCompanyName() {
-        return this.companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getTelephone() {
-        return this.telephone;
-    }
-
-    public void setTelephone(String telephone) {
-        this.telephone = telephone;
-    }
-
-    public String getFaxes() {
-        return this.faxes;
-    }
-
-    public void setFaxes(String faxes) {
-        this.faxes = faxes;
-    }
-
-    public String getPostcode() {
-        return this.postcode;
-    }
-
-    public void setPostcode(String postcode) {
-        this.postcode = postcode;
-    }
-
-    public String getAddress() {
-        return this.address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    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 getServiceTime() {
-        return serviceTime;
-    }
-
-    public void setServiceTime(String serviceTime) {
-        this.serviceTime = serviceTime;
-    }
-
-    public String getServicePhone() {
-        return servicePhone;
-    }
-
-    public void setServicePhone(String servicePhone) {
-        this.servicePhone = servicePhone;
-    }
-}
-

+ 0 - 154
src/main/java/com/izouma/awesomeadmin/model/CouponInfo.java

@@ -1,154 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CouponInfo{
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private String name;
-    private String discription;
-    private String discountMoney;
-    private String limitMoney;
-    private Integer typeFlag;
-    private Integer statusFlag;
-    private Integer availableDays;
-
-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 getName(){
-        return this.name;
-    }
-
-    public void setName(String name){
-        this.name = name;
-    }
-    public String getDiscription(){
-        return this.discription;
-    }
-
-    public void setDiscription(String discription){
-        this.discription = discription;
-    }
-    public String getDiscountMoney(){
-        return this.discountMoney;
-    }
-
-    public void setDiscountMoney(String discountMoney){
-        this.discountMoney = discountMoney;
-    }
-    public String getLimitMoney(){
-        return this.limitMoney;
-    }
-
-    public void setLimitMoney(String limitMoney){
-        this.limitMoney = limitMoney;
-    }
-    public Integer getTypeFlag(){
-        return this.typeFlag;
-    }
-
-    public void setTypeFlag(Integer typeFlag){
-        this.typeFlag = typeFlag;
-    }
-    public Integer getStatusFlag(){
-        return this.statusFlag;
-    }
-
-    public void setStatusFlag(Integer statusFlag){
-        this.statusFlag = statusFlag;
-    }
-    public Integer getAvailableDays(){
-        return this.availableDays;
-    }
-
-    public void setAvailableDays(Integer availableDays){
-        this.availableDays = availableDays;
-    }
-
-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;
-}
-
-}
-

Some files were not shown because too many files changed in this diff