Pārlūkot izejas kodu

拼团基础代码

suochencheng 6 gadi atpakaļ
vecāks
revīzija
547f71fc9f
25 mainītis faili ar 5480 papildinājumiem un 0 dzēšanām
  1. 35 0
      src/main/java/com/izouma/awesomeadmin/dao/GroupActivityMapper.java
  2. 692 0
      src/main/java/com/izouma/awesomeadmin/dao/GroupActivityMapper.xml
  3. 35 0
      src/main/java/com/izouma/awesomeadmin/dao/GroupInfoMapper.java
  4. 524 0
      src/main/java/com/izouma/awesomeadmin/dao/GroupInfoMapper.xml
  5. 35 0
      src/main/java/com/izouma/awesomeadmin/dao/GroupMemberMapper.java
  6. 482 0
      src/main/java/com/izouma/awesomeadmin/dao/GroupMemberMapper.xml
  7. 257 0
      src/main/java/com/izouma/awesomeadmin/model/GroupActivity.java
  8. 192 0
      src/main/java/com/izouma/awesomeadmin/model/GroupInfo.java
  9. 176 0
      src/main/java/com/izouma/awesomeadmin/model/GroupMember.java
  10. 28 0
      src/main/java/com/izouma/awesomeadmin/service/GroupActivityService.java
  11. 28 0
      src/main/java/com/izouma/awesomeadmin/service/GroupInfoService.java
  12. 28 0
      src/main/java/com/izouma/awesomeadmin/service/GroupMemberService.java
  13. 117 0
      src/main/java/com/izouma/awesomeadmin/service/impl/GroupActivityServiceImpl.java
  14. 117 0
      src/main/java/com/izouma/awesomeadmin/service/impl/GroupInfoServiceImpl.java
  15. 117 0
      src/main/java/com/izouma/awesomeadmin/service/impl/GroupMemberServiceImpl.java
  16. 140 0
      src/main/java/com/izouma/awesomeadmin/web/GroupActivityController.java
  17. 132 0
      src/main/java/com/izouma/awesomeadmin/web/GroupInfoController.java
  18. 130 0
      src/main/java/com/izouma/awesomeadmin/web/GroupMemberController.java
  19. 89 0
      src/main/vue/src/pages/GroupActivity.vue
  20. 680 0
      src/main/vue/src/pages/GroupActivitys.vue
  21. 175 0
      src/main/vue/src/pages/GroupInfo.vue
  22. 552 0
      src/main/vue/src/pages/GroupInfos.vue
  23. 169 0
      src/main/vue/src/pages/GroupMember.vue
  24. 520 0
      src/main/vue/src/pages/GroupMembers.vue
  25. 30 0
      src/main/vue/src/router/index.js

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

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

+ 692 - 0
src/main/java/com/izouma/awesomeadmin/dao/GroupActivityMapper.xml

@@ -0,0 +1,692 @@
+<?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.GroupActivityMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.GroupActivity">
+        <!--generatedStart-->
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="group_type" property="groupType" jdbcType="INTEGER"/>
+        <result column="group_name" property="groupName" jdbcType="VARCHAR"/>
+        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
+        <result column="product_id" property="productId" jdbcType="INTEGER"/>
+        <result column="sku_flag" property="skuFlag" jdbcType="CHAR"/>
+        <result column="sku_id" property="skuId" jdbcType="INTEGER"/>
+        <result column="total_amount" property="totalAmount" jdbcType="INTEGER"/>
+        <result column="current_amount" property="currentAmount" jdbcType="INTEGER"/>
+        <result column="discount_price" property="discountPrice" jdbcType="DECIMAL"/>
+        <result column="original_price" property="originalPrice" jdbcType="DECIMAL"/>
+        <result column="group_number" property="groupNumber" jdbcType="INTEGER"/>
+        <result column="group_days" property="groupDays" jdbcType="INTEGER"/>
+        <result column="begin_time" property="beginTime" jdbcType="TIMESTAMP"/>
+        <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
+        <result column="image" property="image" jdbcType="VARCHAR"/>
+        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
+        <!--generatedEnd-->
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        <!--generatedStart-->
+        id, del_flag, update_time, update_user, create_time, create_user, group_type, group_name, store_id, product_id, sku_flag, sku_id, total_amount, current_amount, discount_price, original_price, group_number, group_days, begin_time, end_time, image, status_flag, remark, rank        <!--generatedEnd-->
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM group_activity
+        WHERE id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        DELETE
+        FROM group_activity
+        WHERE id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.GroupActivity" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO group_activity
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id!= null">
+                id,
+            </if>
+            <if test="delFlag!= null">
+                del_flag,
+            </if>
+            <if test="updateTime!= null">
+                update_time,
+            </if>
+            <if test="updateUser!= null">
+                update_user,
+            </if>
+            <if test="createTime!= null">
+                create_time,
+            </if>
+            <if test="createUser!= null">
+                create_user,
+            </if>
+            <if test="groupType!= null">
+                group_type,
+            </if>
+            <if test="groupName!= null">
+                group_name,
+            </if>
+            <if test="storeId!= null">
+                store_id,
+            </if>
+            <if test="productId!= null">
+                product_id,
+            </if>
+            <if test="skuFlag!= null">
+                sku_flag,
+            </if>
+            <if test="skuId!= null">
+                sku_id,
+            </if>
+            <if test="totalAmount!= null">
+                total_amount,
+            </if>
+            <if test="currentAmount!= null">
+                current_amount,
+            </if>
+            <if test="discountPrice!= null">
+                discount_price,
+            </if>
+            <if test="originalPrice!= null">
+                original_price,
+            </if>
+            <if test="groupNumber!= null">
+                group_number,
+            </if>
+            <if test="groupDays!= null">
+                group_days,
+            </if>
+            <if test="beginTime!= null">
+                begin_time,
+            </if>
+            <if test="endTime!= null">
+                end_time,
+            </if>
+            <if test="image!= null">
+                image,
+            </if>
+            <if test="statusFlag!= null">
+                status_flag,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <if test="rank!= null">
+                rank,
+            </if>
+            <!--generatedEnd-->
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="groupType != null">
+                #{groupType,jdbcType=INTEGER},
+            </if>
+            <if test="groupName != null">
+                #{groupName,jdbcType=VARCHAR},
+            </if>
+            <if test="storeId != null">
+                #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="productId != null">
+                #{productId,jdbcType=INTEGER},
+            </if>
+            <if test="skuFlag != null">
+                #{skuFlag,jdbcType=CHAR},
+            </if>
+            <if test="skuId != null">
+                #{skuId,jdbcType=INTEGER},
+            </if>
+            <if test="totalAmount != null">
+                #{totalAmount,jdbcType=INTEGER},
+            </if>
+            <if test="currentAmount != null">
+                #{currentAmount,jdbcType=INTEGER},
+            </if>
+            <if test="discountPrice != null">
+                #{discountPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="originalPrice != null">
+                #{originalPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="groupNumber != null">
+                #{groupNumber,jdbcType=INTEGER},
+            </if>
+            <if test="groupDays != null">
+                #{groupDays,jdbcType=INTEGER},
+            </if>
+            <if test="beginTime != null">
+                #{beginTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="endTime != null">
+                #{endTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="image != null">
+                #{image,jdbcType=VARCHAR},
+            </if>
+            <if test="statusFlag != null">
+                #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="rank != null">
+                #{rank,jdbcType=INTEGER},
+            </if>
+            <!--generatedEnd-->
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.GroupActivity">
+        UPDATE group_activity
+        <set>
+            <!--generatedStart-->
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="groupType != null">
+                group_type= #{groupType,jdbcType=INTEGER},
+            </if>
+            <if test="groupName != null">
+                group_name= #{groupName,jdbcType=VARCHAR},
+            </if>
+            <if test="storeId != null">
+                store_id= #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="productId != null">
+                product_id= #{productId,jdbcType=INTEGER},
+            </if>
+            <if test="skuFlag != null">
+                sku_flag= #{skuFlag,jdbcType=CHAR},
+            </if>
+            <if test="skuId != null">
+                sku_id= #{skuId,jdbcType=INTEGER},
+            </if>
+            <if test="totalAmount != null">
+                total_amount= #{totalAmount,jdbcType=INTEGER},
+            </if>
+            <if test="currentAmount != null">
+                current_amount= #{currentAmount,jdbcType=INTEGER},
+            </if>
+            <if test="discountPrice != null">
+                discount_price= #{discountPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="originalPrice != null">
+                original_price= #{originalPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="groupNumber != null">
+                group_number= #{groupNumber,jdbcType=INTEGER},
+            </if>
+            <if test="groupDays != null">
+                group_days= #{groupDays,jdbcType=INTEGER},
+            </if>
+            <if test="beginTime != null">
+                begin_time= #{beginTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="endTime != null">
+                end_time= #{endTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="image != null">
+                image= #{image,jdbcType=VARCHAR},
+            </if>
+            <if test="statusFlag != null">
+                status_flag= #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
+            </if>
+            <!--generatedEnd-->
+        </set>
+        WHERE
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id IN (${idStr})
+        </if>
+    </update>
+
+    <select id="queryGroupActivityByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupActivity">
+        SELECT <include refid="Base_Column_List"/> FROM group_activity
+        <where>
+            AND del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                AND id IN (${record.idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                AND id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                AND del_flag = #{record.delFlag}
+            </if>
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                AND update_time = #{record.updateTime}
+            </if>
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                AND update_user = #{record.updateUser}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                AND create_time = #{record.createTime}
+            </if>
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                AND create_user = #{record.createUser}
+            </if>
+            <if test="record.groupType != null and !&quot;&quot;.equals(record.groupType)">
+                AND group_type = #{record.groupType}
+            </if>
+            <if test="record.groupName != null and !&quot;&quot;.equals(record.groupName)">
+                AND group_name = #{record.groupName}
+            </if>
+            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                AND store_id = #{record.storeId}
+            </if>
+            <if test="record.productId != null and !&quot;&quot;.equals(record.productId)">
+                AND product_id = #{record.productId}
+            </if>
+            <if test="record.skuFlag != null and !&quot;&quot;.equals(record.skuFlag)">
+                AND sku_flag = #{record.skuFlag}
+            </if>
+            <if test="record.skuId != null and !&quot;&quot;.equals(record.skuId)">
+                AND sku_id = #{record.skuId}
+            </if>
+            <if test="record.totalAmount != null and !&quot;&quot;.equals(record.totalAmount)">
+                AND total_amount = #{record.totalAmount}
+            </if>
+            <if test="record.currentAmount != null and !&quot;&quot;.equals(record.currentAmount)">
+                AND current_amount = #{record.currentAmount}
+            </if>
+            <if test="record.discountPrice != null and !&quot;&quot;.equals(record.discountPrice)">
+                AND discount_price = #{record.discountPrice}
+            </if>
+            <if test="record.originalPrice != null and !&quot;&quot;.equals(record.originalPrice)">
+                AND original_price = #{record.originalPrice}
+            </if>
+            <if test="record.groupNumber != null and !&quot;&quot;.equals(record.groupNumber)">
+                AND group_number = #{record.groupNumber}
+            </if>
+            <if test="record.groupDays != null and !&quot;&quot;.equals(record.groupDays)">
+                AND group_days = #{record.groupDays}
+            </if>
+            <if test="record.beginTime != null and !&quot;&quot;.equals(record.beginTime)">
+                AND begin_time = #{record.beginTime}
+            </if>
+            <if test="record.endTime != null and !&quot;&quot;.equals(record.endTime)">
+                AND end_time = #{record.endTime}
+            </if>
+            <if test="record.image != null and !&quot;&quot;.equals(record.image)">
+                AND image = #{record.image}
+            </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.rank != null and !&quot;&quot;.equals(record.rank)">
+                AND rank = #{record.rank}
+            </if>
+            <!--generatedEnd-->
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR group_type LIKE concat('%',#{record.searchKey},'%')
+                    OR group_name LIKE concat('%',#{record.searchKey},'%')
+                    OR store_id LIKE concat('%',#{record.searchKey},'%')
+                    OR product_id LIKE concat('%',#{record.searchKey},'%')
+                    OR sku_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR sku_id LIKE concat('%',#{record.searchKey},'%')
+                    OR total_amount LIKE concat('%',#{record.searchKey},'%')
+                    OR current_amount LIKE concat('%',#{record.searchKey},'%')
+                    OR discount_price LIKE concat('%',#{record.searchKey},'%')
+                    OR original_price LIKE concat('%',#{record.searchKey},'%')
+                    OR group_number LIKE concat('%',#{record.searchKey},'%')
+                    OR group_days LIKE concat('%',#{record.searchKey},'%')
+                    OR begin_time LIKE concat('%',#{record.searchKey},'%')
+                    OR end_time LIKE concat('%',#{record.searchKey},'%')
+                    OR image LIKE concat('%',#{record.searchKey},'%')
+                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR rank LIKE concat('%',#{record.searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryAllGroupActivity" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupActivity">
+        SELECT <include refid="Base_Column_List"/> FROM group_activity
+        <where>
+            AND del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                AND id IN (${idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="groupType != null and !&quot;&quot;.equals(groupType)">
+                AND group_type = #{groupType}
+            </if>
+            <if test="groupName != null and !&quot;&quot;.equals(groupName)">
+                AND group_name = #{groupName}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                AND store_id = #{storeId}
+            </if>
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                AND product_id = #{productId}
+            </if>
+            <if test="skuFlag != null and !&quot;&quot;.equals(skuFlag)">
+                AND sku_flag = #{skuFlag}
+            </if>
+            <if test="skuId != null and !&quot;&quot;.equals(skuId)">
+                AND sku_id = #{skuId}
+            </if>
+            <if test="totalAmount != null and !&quot;&quot;.equals(totalAmount)">
+                AND total_amount = #{totalAmount}
+            </if>
+            <if test="currentAmount != null and !&quot;&quot;.equals(currentAmount)">
+                AND current_amount = #{currentAmount}
+            </if>
+            <if test="discountPrice != null and !&quot;&quot;.equals(discountPrice)">
+                AND discount_price = #{discountPrice}
+            </if>
+            <if test="originalPrice != null and !&quot;&quot;.equals(originalPrice)">
+                AND original_price = #{originalPrice}
+            </if>
+            <if test="groupNumber != null and !&quot;&quot;.equals(groupNumber)">
+                AND group_number = #{groupNumber}
+            </if>
+            <if test="groupDays != null and !&quot;&quot;.equals(groupDays)">
+                AND group_days = #{groupDays}
+            </if>
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                AND begin_time = #{beginTime}
+            </if>
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                AND end_time = #{endTime}
+            </if>
+            <if test="image != null and !&quot;&quot;.equals(image)">
+                AND image = #{image}
+            </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="rank != null and !&quot;&quot;.equals(rank)">
+                AND rank = #{rank}
+            </if>
+            <!--generatedEnd-->
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR group_type LIKE concat('%',#{searchKey},'%')
+                    OR group_name LIKE concat('%',#{searchKey},'%')
+                    OR store_id LIKE concat('%',#{searchKey},'%')
+                    OR product_id LIKE concat('%',#{searchKey},'%')
+                    OR sku_flag LIKE concat('%',#{searchKey},'%')
+                    OR sku_id LIKE concat('%',#{searchKey},'%')
+                    OR total_amount LIKE concat('%',#{searchKey},'%')
+                    OR current_amount LIKE concat('%',#{searchKey},'%')
+                    OR discount_price LIKE concat('%',#{searchKey},'%')
+                    OR original_price LIKE concat('%',#{searchKey},'%')
+                    OR group_number LIKE concat('%',#{searchKey},'%')
+                    OR group_days LIKE concat('%',#{searchKey},'%')
+                    OR begin_time LIKE concat('%',#{searchKey},'%')
+                    OR end_time LIKE concat('%',#{searchKey},'%')
+                    OR image LIKE concat('%',#{searchKey},'%')
+                    OR status_flag LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryGroupActivity" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupActivity">
+        SELECT <include refid="Base_Column_List"/> FROM group_activity
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="groupType != null and !&quot;&quot;.equals(groupType)">
+                AND group_type = #{groupType}
+            </if>
+            <if test="groupName != null and !&quot;&quot;.equals(groupName)">
+                AND group_name = #{groupName}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                AND store_id = #{storeId}
+            </if>
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                AND product_id = #{productId}
+            </if>
+            <if test="skuFlag != null and !&quot;&quot;.equals(skuFlag)">
+                AND sku_flag = #{skuFlag}
+            </if>
+            <if test="skuId != null and !&quot;&quot;.equals(skuId)">
+                AND sku_id = #{skuId}
+            </if>
+            <if test="totalAmount != null and !&quot;&quot;.equals(totalAmount)">
+                AND total_amount = #{totalAmount}
+            </if>
+            <if test="currentAmount != null and !&quot;&quot;.equals(currentAmount)">
+                AND current_amount = #{currentAmount}
+            </if>
+            <if test="discountPrice != null and !&quot;&quot;.equals(discountPrice)">
+                AND discount_price = #{discountPrice}
+            </if>
+            <if test="originalPrice != null and !&quot;&quot;.equals(originalPrice)">
+                AND original_price = #{originalPrice}
+            </if>
+            <if test="groupNumber != null and !&quot;&quot;.equals(groupNumber)">
+                AND group_number = #{groupNumber}
+            </if>
+            <if test="groupDays != null and !&quot;&quot;.equals(groupDays)">
+                AND group_days = #{groupDays}
+            </if>
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                AND begin_time = #{beginTime}
+            </if>
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                AND end_time = #{endTime}
+            </if>
+            <if test="image != null and !&quot;&quot;.equals(image)">
+                AND image = #{image}
+            </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="rank != null and !&quot;&quot;.equals(rank)">
+                AND rank = #{rank}
+            </if>
+            <!--generatedEnd-->
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE group_activity 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.GroupActivity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM group_activity
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <!--generatedEnd-->
+        </where>
+        ORDER BY id DESC
+    </select>
+</mapper>
+

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

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

+ 524 - 0
src/main/java/com/izouma/awesomeadmin/dao/GroupInfoMapper.xml

@@ -0,0 +1,524 @@
+<?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.GroupInfoMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.GroupInfo">
+        <!--generatedStart-->
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="product_id" property="productId" jdbcType="INTEGER"/>
+        <result column="user_id" property="userId" jdbcType="INTEGER"/>
+        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
+        <result column="group_activity_id" property="groupActivityId" jdbcType="INTEGER"/>
+        <result column="begin_time" property="beginTime" jdbcType="TIMESTAMP"/>
+        <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
+        <result column="team_number" property="teamNumber" jdbcType="INTEGER"/>
+        <result column="limit_number" property="limitNumber" jdbcType="INTEGER"/>
+        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <!--generatedEnd-->
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        <!--generatedStart-->
+        id, del_flag, update_time, update_user, create_time, create_user, product_id, user_id, store_id, group_activity_id, begin_time, end_time, team_number, limit_number, status_flag, remark        <!--generatedEnd-->
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM group_info
+        WHERE id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        DELETE
+        FROM group_info
+        WHERE id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.GroupInfo" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO group_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id!= null">
+                id,
+            </if>
+            <if test="delFlag!= null">
+                del_flag,
+            </if>
+            <if test="updateTime!= null">
+                update_time,
+            </if>
+            <if test="updateUser!= null">
+                update_user,
+            </if>
+            <if test="createTime!= null">
+                create_time,
+            </if>
+            <if test="createUser!= null">
+                create_user,
+            </if>
+            <if test="productId!= null">
+                product_id,
+            </if>
+            <if test="userId!= null">
+                user_id,
+            </if>
+            <if test="storeId!= null">
+                store_id,
+            </if>
+            <if test="groupActivityId!= null">
+                group_activity_id,
+            </if>
+            <if test="beginTime!= null">
+                begin_time,
+            </if>
+            <if test="endTime!= null">
+                end_time,
+            </if>
+            <if test="teamNumber!= null">
+                team_number,
+            </if>
+            <if test="limitNumber!= null">
+                limit_number,
+            </if>
+            <if test="statusFlag!= null">
+                status_flag,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <!--generatedEnd-->
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                #{productId,jdbcType=INTEGER},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=INTEGER},
+            </if>
+            <if test="storeId != null">
+                #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="groupActivityId != null">
+                #{groupActivityId,jdbcType=INTEGER},
+            </if>
+            <if test="beginTime != null">
+                #{beginTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="endTime != null">
+                #{endTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="teamNumber != null">
+                #{teamNumber,jdbcType=INTEGER},
+            </if>
+            <if test="limitNumber != null">
+                #{limitNumber,jdbcType=INTEGER},
+            </if>
+            <if test="statusFlag != null">
+                #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <!--generatedEnd-->
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.GroupInfo">
+        UPDATE group_info
+        <set>
+            <!--generatedStart-->
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                product_id= #{productId,jdbcType=INTEGER},
+            </if>
+            <if test="userId != null">
+                user_id= #{userId,jdbcType=INTEGER},
+            </if>
+            <if test="storeId != null">
+                store_id= #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="groupActivityId != null">
+                group_activity_id= #{groupActivityId,jdbcType=INTEGER},
+            </if>
+            <if test="beginTime != null">
+                begin_time= #{beginTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="endTime != null">
+                end_time= #{endTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="teamNumber != null">
+                team_number= #{teamNumber,jdbcType=INTEGER},
+            </if>
+            <if test="limitNumber != null">
+                limit_number= #{limitNumber,jdbcType=INTEGER},
+            </if>
+            <if test="statusFlag != null">
+                status_flag= #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <!--generatedEnd-->
+        </set>
+        WHERE
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id IN (${idStr})
+        </if>
+    </update>
+
+    <select id="queryGroupInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupInfo">
+        SELECT <include refid="Base_Column_List"/> FROM group_info
+        <where>
+            AND del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                AND id IN (${record.idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                AND id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                AND del_flag = #{record.delFlag}
+            </if>
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                AND update_time = #{record.updateTime}
+            </if>
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                AND update_user = #{record.updateUser}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                AND create_time = #{record.createTime}
+            </if>
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                AND create_user = #{record.createUser}
+            </if>
+            <if test="record.productId != null and !&quot;&quot;.equals(record.productId)">
+                AND product_id = #{record.productId}
+            </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.groupActivityId != null and !&quot;&quot;.equals(record.groupActivityId)">
+                AND group_activity_id = #{record.groupActivityId}
+            </if>
+            <if test="record.beginTime != null and !&quot;&quot;.equals(record.beginTime)">
+                AND begin_time = #{record.beginTime}
+            </if>
+            <if test="record.endTime != null and !&quot;&quot;.equals(record.endTime)">
+                AND end_time = #{record.endTime}
+            </if>
+            <if test="record.teamNumber != null and !&quot;&quot;.equals(record.teamNumber)">
+                AND team_number = #{record.teamNumber}
+            </if>
+            <if test="record.limitNumber != null and !&quot;&quot;.equals(record.limitNumber)">
+                AND limit_number = #{record.limitNumber}
+            </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>
+            <!--generatedEnd-->
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR product_id LIKE concat('%',#{record.searchKey},'%')
+                    OR user_id LIKE concat('%',#{record.searchKey},'%')
+                    OR store_id LIKE concat('%',#{record.searchKey},'%')
+                    OR group_activity_id LIKE concat('%',#{record.searchKey},'%')
+                    OR begin_time LIKE concat('%',#{record.searchKey},'%')
+                    OR end_time LIKE concat('%',#{record.searchKey},'%')
+                    OR team_number LIKE concat('%',#{record.searchKey},'%')
+                    OR limit_number LIKE concat('%',#{record.searchKey},'%')
+                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryAllGroupInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupInfo">
+        SELECT <include refid="Base_Column_List"/> FROM group_info
+        <where>
+            AND del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                AND id IN (${idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                AND product_id = #{productId}
+            </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="groupActivityId != null and !&quot;&quot;.equals(groupActivityId)">
+                AND group_activity_id = #{groupActivityId}
+            </if>
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                AND begin_time = #{beginTime}
+            </if>
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                AND end_time = #{endTime}
+            </if>
+            <if test="teamNumber != null and !&quot;&quot;.equals(teamNumber)">
+                AND team_number = #{teamNumber}
+            </if>
+            <if test="limitNumber != null and !&quot;&quot;.equals(limitNumber)">
+                AND limit_number = #{limitNumber}
+            </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>
+            <!--generatedEnd-->
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR product_id LIKE concat('%',#{searchKey},'%')
+                    OR user_id LIKE concat('%',#{searchKey},'%')
+                    OR store_id LIKE concat('%',#{searchKey},'%')
+                    OR group_activity_id LIKE concat('%',#{searchKey},'%')
+                    OR begin_time LIKE concat('%',#{searchKey},'%')
+                    OR end_time LIKE concat('%',#{searchKey},'%')
+                    OR team_number LIKE concat('%',#{searchKey},'%')
+                    OR limit_number LIKE concat('%',#{searchKey},'%')
+                    OR status_flag LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryGroupInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupInfo">
+        SELECT <include refid="Base_Column_List"/> FROM group_info
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                AND product_id = #{productId}
+            </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="groupActivityId != null and !&quot;&quot;.equals(groupActivityId)">
+                AND group_activity_id = #{groupActivityId}
+            </if>
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                AND begin_time = #{beginTime}
+            </if>
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                AND end_time = #{endTime}
+            </if>
+            <if test="teamNumber != null and !&quot;&quot;.equals(teamNumber)">
+                AND team_number = #{teamNumber}
+            </if>
+            <if test="limitNumber != null and !&quot;&quot;.equals(limitNumber)">
+                AND limit_number = #{limitNumber}
+            </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>
+            <!--generatedEnd-->
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE group_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.GroupInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM group_info
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <!--generatedEnd-->
+        </where>
+        ORDER BY id DESC
+    </select>
+</mapper>
+

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

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

+ 482 - 0
src/main/java/com/izouma/awesomeadmin/dao/GroupMemberMapper.xml

@@ -0,0 +1,482 @@
+<?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.GroupMemberMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.GroupMember">
+        <!--generatedStart-->
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="product_id" property="productId" jdbcType="INTEGER"/>
+        <result column="store_id" property="storeId" jdbcType="INTEGER"/>
+        <result column="user_id" property="userId" jdbcType="INTEGER"/>
+        <result column="group_info_id" property="groupInfoId" jdbcType="INTEGER"/>
+        <result column="group_activity_id" property="groupActivityId" jdbcType="INTEGER"/>
+        <result column="order_id" property="orderId" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
+        <!--generatedEnd-->
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        <!--generatedStart-->
+        id, del_flag, update_time, update_user, create_time, create_user, product_id, store_id, user_id, group_info_id, group_activity_id, order_id, remark, status_flag        <!--generatedEnd-->
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM group_member
+        WHERE id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        DELETE
+        FROM group_member
+        WHERE id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.GroupMember" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO group_member
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id!= null">
+                id,
+            </if>
+            <if test="delFlag!= null">
+                del_flag,
+            </if>
+            <if test="updateTime!= null">
+                update_time,
+            </if>
+            <if test="updateUser!= null">
+                update_user,
+            </if>
+            <if test="createTime!= null">
+                create_time,
+            </if>
+            <if test="createUser!= null">
+                create_user,
+            </if>
+            <if test="productId!= null">
+                product_id,
+            </if>
+            <if test="storeId!= null">
+                store_id,
+            </if>
+            <if test="userId!= null">
+                user_id,
+            </if>
+            <if test="groupInfoId!= null">
+                group_info_id,
+            </if>
+            <if test="groupActivityId!= null">
+                group_activity_id,
+            </if>
+            <if test="orderId!= null">
+                order_id,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <if test="statusFlag!= null">
+                status_flag,
+            </if>
+            <!--generatedEnd-->
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <!--generatedStart-->
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                #{productId,jdbcType=INTEGER},
+            </if>
+            <if test="storeId != null">
+                #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=INTEGER},
+            </if>
+            <if test="groupInfoId != null">
+                #{groupInfoId,jdbcType=INTEGER},
+            </if>
+            <if test="groupActivityId != null">
+                #{groupActivityId,jdbcType=INTEGER},
+            </if>
+            <if test="orderId != null">
+                #{orderId,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="statusFlag != null">
+                #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <!--generatedEnd-->
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.GroupMember">
+        UPDATE group_member
+        <set>
+            <!--generatedStart-->
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                product_id= #{productId,jdbcType=INTEGER},
+            </if>
+            <if test="storeId != null">
+                store_id= #{storeId,jdbcType=INTEGER},
+            </if>
+            <if test="userId != null">
+                user_id= #{userId,jdbcType=INTEGER},
+            </if>
+            <if test="groupInfoId != null">
+                group_info_id= #{groupInfoId,jdbcType=INTEGER},
+            </if>
+            <if test="groupActivityId != null">
+                group_activity_id= #{groupActivityId,jdbcType=INTEGER},
+            </if>
+            <if test="orderId != null">
+                order_id= #{orderId,jdbcType=INTEGER},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="statusFlag != null">
+                status_flag= #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <!--generatedEnd-->
+        </set>
+        WHERE
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id IN (${idStr})
+        </if>
+    </update>
+
+    <select id="queryGroupMemberByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupMember">
+        SELECT <include refid="Base_Column_List"/> FROM group_member
+        <where>
+            AND del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                AND id IN (${record.idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                AND id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                AND del_flag = #{record.delFlag}
+            </if>
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                AND update_time = #{record.updateTime}
+            </if>
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                AND update_user = #{record.updateUser}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                AND create_time = #{record.createTime}
+            </if>
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                AND create_user = #{record.createUser}
+            </if>
+            <if test="record.productId != null and !&quot;&quot;.equals(record.productId)">
+                AND product_id = #{record.productId}
+            </if>
+            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                AND store_id = #{record.storeId}
+            </if>
+            <if test="record.userId != null and !&quot;&quot;.equals(record.userId)">
+                AND user_id = #{record.userId}
+            </if>
+            <if test="record.groupInfoId != null and !&quot;&quot;.equals(record.groupInfoId)">
+                AND group_info_id = #{record.groupInfoId}
+            </if>
+            <if test="record.groupActivityId != null and !&quot;&quot;.equals(record.groupActivityId)">
+                AND group_activity_id = #{record.groupActivityId}
+            </if>
+            <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
+                AND order_id = #{record.orderId}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                AND remark = #{record.remark}
+            </if>
+            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
+                AND status_flag = #{record.statusFlag}
+            </if>
+            <!--generatedEnd-->
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR product_id LIKE concat('%',#{record.searchKey},'%')
+                    OR store_id LIKE concat('%',#{record.searchKey},'%')
+                    OR user_id LIKE concat('%',#{record.searchKey},'%')
+                    OR group_info_id LIKE concat('%',#{record.searchKey},'%')
+                    OR group_activity_id LIKE concat('%',#{record.searchKey},'%')
+                    OR order_id LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryAllGroupMember" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupMember">
+        SELECT <include refid="Base_Column_List"/> FROM group_member
+        <where>
+            AND del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                AND id IN (${idStr})
+            </if>
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                AND product_id = #{productId}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                AND store_id = #{storeId}
+            </if>
+            <if test="userId != null and !&quot;&quot;.equals(userId)">
+                AND user_id = #{userId}
+            </if>
+            <if test="groupInfoId != null and !&quot;&quot;.equals(groupInfoId)">
+                AND group_info_id = #{groupInfoId}
+            </if>
+            <if test="groupActivityId != null and !&quot;&quot;.equals(groupActivityId)">
+                AND group_activity_id = #{groupActivityId}
+            </if>
+            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                AND order_id = #{orderId}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                AND remark = #{remark}
+            </if>
+            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
+                AND status_flag = #{statusFlag}
+            </if>
+            <!--generatedEnd-->
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    <!--generatedStart-->
+                    OR product_id LIKE concat('%',#{searchKey},'%')
+                    OR store_id LIKE concat('%',#{searchKey},'%')
+                    OR user_id LIKE concat('%',#{searchKey},'%')
+                    OR group_info_id LIKE concat('%',#{searchKey},'%')
+                    OR group_activity_id LIKE concat('%',#{searchKey},'%')
+                    OR order_id LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR status_flag LIKE concat('%',#{searchKey},'%')
+                    <!--generatedEnd-->
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id DESC
+    </select>
+
+    <select id="queryGroupMember" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.GroupMember">
+        SELECT <include refid="Base_Column_List"/> FROM group_member
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                AND id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                AND del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                AND update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                AND update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                AND create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                AND create_user = #{createUser}
+            </if>
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                AND product_id = #{productId}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                AND store_id = #{storeId}
+            </if>
+            <if test="userId != null and !&quot;&quot;.equals(userId)">
+                AND user_id = #{userId}
+            </if>
+            <if test="groupInfoId != null and !&quot;&quot;.equals(groupInfoId)">
+                AND group_info_id = #{groupInfoId}
+            </if>
+            <if test="groupActivityId != null and !&quot;&quot;.equals(groupActivityId)">
+                AND group_activity_id = #{groupActivityId}
+            </if>
+            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                AND order_id = #{orderId}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                AND remark = #{remark}
+            </if>
+            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
+                AND status_flag = #{statusFlag}
+            </if>
+            <!--generatedEnd-->
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE group_member 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.GroupMember">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM group_member
+        <where>
+            AND del_flag = 'N'
+            <!--generatedStart-->
+            <!--generatedEnd-->
+        </where>
+        ORDER BY id DESC
+    </select>
+</mapper>
+

+ 257 - 0
src/main/java/com/izouma/awesomeadmin/model/GroupActivity.java

@@ -0,0 +1,257 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GroupActivity{
+    /*generatedStart*/
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer groupType;
+    private String groupName;
+    private Integer storeId;
+    private Integer productId;
+    private String skuFlag;
+    private Integer skuId;
+    private Integer totalAmount;
+    private Integer currentAmount;
+    private BigDecimal discountPrice;
+    private BigDecimal originalPrice;
+    private Integer groupNumber;
+    private Integer groupDays;
+    private Date beginTime;
+    private Date endTime;
+    private String image;
+    private Integer statusFlag;
+    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;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getGroupType(){
+        return this.groupType;
+    }
+
+    public void setGroupType(Integer groupType){
+        this.groupType = groupType;
+    }
+    public String getGroupName(){
+        return this.groupName;
+    }
+
+    public void setGroupName(String groupName){
+        this.groupName = groupName;
+    }
+    public Integer getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(Integer storeId){
+        this.storeId = storeId;
+    }
+    public Integer getProductId(){
+        return this.productId;
+    }
+
+    public void setProductId(Integer productId){
+        this.productId = productId;
+    }
+    public String getSkuFlag(){
+        return this.skuFlag;
+    }
+
+    public void setSkuFlag(String skuFlag){
+        this.skuFlag = skuFlag;
+    }
+    public Integer getSkuId(){
+        return this.skuId;
+    }
+
+    public void setSkuId(Integer skuId){
+        this.skuId = skuId;
+    }
+    public Integer getTotalAmount(){
+        return this.totalAmount;
+    }
+
+    public void setTotalAmount(Integer totalAmount){
+        this.totalAmount = totalAmount;
+    }
+    public Integer getCurrentAmount(){
+        return this.currentAmount;
+    }
+
+    public void setCurrentAmount(Integer currentAmount){
+        this.currentAmount = currentAmount;
+    }
+    public BigDecimal getDiscountPrice(){
+        return this.discountPrice;
+    }
+
+    public void setDiscountPrice(BigDecimal discountPrice){
+        this.discountPrice = discountPrice;
+    }
+    public BigDecimal getOriginalPrice(){
+        return this.originalPrice;
+    }
+
+    public void setOriginalPrice(BigDecimal originalPrice){
+        this.originalPrice = originalPrice;
+    }
+    public Integer getGroupNumber(){
+        return this.groupNumber;
+    }
+
+    public void setGroupNumber(Integer groupNumber){
+        this.groupNumber = groupNumber;
+    }
+    public Integer getGroupDays(){
+        return this.groupDays;
+    }
+
+    public void setGroupDays(Integer groupDays){
+        this.groupDays = groupDays;
+    }
+    public Date getBeginTime(){
+        return this.beginTime;
+    }
+
+    public void setBeginTime(Date beginTime){
+        this.beginTime = beginTime;
+    }
+    public Date getEndTime(){
+        return this.endTime;
+    }
+
+    public void setEndTime(Date endTime){
+        this.endTime = endTime;
+    }
+    public String getImage(){
+        return this.image;
+    }
+
+    public void setImage(String image){
+        this.image = image;
+    }
+    public Integer getStatusFlag(){
+        return this.statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag){
+        this.statusFlag = statusFlag;
+    }
+    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;
+    }
+    /*generatedEnd*/
+
+}
+

+ 192 - 0
src/main/java/com/izouma/awesomeadmin/model/GroupInfo.java

@@ -0,0 +1,192 @@
+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 GroupInfo{
+    /*generatedStart*/
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer productId;
+    private Integer userId;
+    private Integer storeId;
+    private Integer groupActivityId;
+    private Date beginTime;
+    private Date endTime;
+    private Integer teamNumber;
+    private Integer limitNumber;
+    private Integer statusFlag;
+    private String remark;
+
+    private String idStr;
+
+    private String searchKey;
+
+    /**
+    * and,test_name,like,value;or,remark,=,123
+    */
+    private String advancedQuery;
+
+    /**
+    * column_name_,desc_;column_name_,asc
+    */
+    private String orderByStr;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getProductId(){
+        return this.productId;
+    }
+
+    public void setProductId(Integer productId){
+        this.productId = productId;
+    }
+    public Integer getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(Integer userId){
+        this.userId = userId;
+    }
+    public Integer getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(Integer storeId){
+        this.storeId = storeId;
+    }
+    public Integer getGroupActivityId(){
+        return this.groupActivityId;
+    }
+
+    public void setGroupActivityId(Integer groupActivityId){
+        this.groupActivityId = groupActivityId;
+    }
+    public Date getBeginTime(){
+        return this.beginTime;
+    }
+
+    public void setBeginTime(Date beginTime){
+        this.beginTime = beginTime;
+    }
+    public Date getEndTime(){
+        return this.endTime;
+    }
+
+    public void setEndTime(Date endTime){
+        this.endTime = endTime;
+    }
+    public Integer getTeamNumber(){
+        return this.teamNumber;
+    }
+
+    public void setTeamNumber(Integer teamNumber){
+        this.teamNumber = teamNumber;
+    }
+    public Integer getLimitNumber(){
+        return this.limitNumber;
+    }
+
+    public void setLimitNumber(Integer limitNumber){
+        this.limitNumber = limitNumber;
+    }
+    public Integer getStatusFlag(){
+        return this.statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag){
+        this.statusFlag = statusFlag;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+
+    public String getSearchKey() {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
+
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
+
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
+
+    public String getOrderByStr() {
+        return orderByStr;
+    }
+
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
+
+    public String getIdStr() {
+        return idStr;
+    }
+
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+    /*generatedEnd*/
+
+}
+

+ 176 - 0
src/main/java/com/izouma/awesomeadmin/model/GroupMember.java

@@ -0,0 +1,176 @@
+package com.izouma.awesomeadmin.model;
+
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GroupMember{
+    /*generatedStart*/
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer productId;
+    private Integer storeId;
+    private Integer userId;
+    private Integer groupInfoId;
+    private Integer groupActivityId;
+    private Integer orderId;
+    private String remark;
+    private Integer statusFlag;
+
+    private String idStr;
+
+    private String searchKey;
+
+    /**
+    * and,test_name,like,value;or,remark,=,123
+    */
+    private String advancedQuery;
+
+    /**
+    * column_name_,desc_;column_name_,asc
+    */
+    private String orderByStr;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getProductId(){
+        return this.productId;
+    }
+
+    public void setProductId(Integer productId){
+        this.productId = productId;
+    }
+    public Integer getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(Integer storeId){
+        this.storeId = storeId;
+    }
+    public Integer getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(Integer userId){
+        this.userId = userId;
+    }
+    public Integer getGroupInfoId(){
+        return this.groupInfoId;
+    }
+
+    public void setGroupInfoId(Integer groupInfoId){
+        this.groupInfoId = groupInfoId;
+    }
+    public Integer getGroupActivityId(){
+        return this.groupActivityId;
+    }
+
+    public void setGroupActivityId(Integer groupActivityId){
+        this.groupActivityId = groupActivityId;
+    }
+    public Integer getOrderId(){
+        return this.orderId;
+    }
+
+    public void setOrderId(Integer orderId){
+        this.orderId = orderId;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public Integer getStatusFlag(){
+        return this.statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag){
+        this.statusFlag = statusFlag;
+    }
+
+    public String getSearchKey() {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
+
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
+
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
+
+    public String getOrderByStr() {
+        return orderByStr;
+    }
+
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
+
+    public String getIdStr() {
+        return idStr;
+    }
+
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+    /*generatedEnd*/
+
+}
+

+ 28 - 0
src/main/java/com/izouma/awesomeadmin/service/GroupActivityService.java

@@ -0,0 +1,28 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.GroupActivity;
+
+
+/**
+*  service接口类
+*/
+public interface GroupActivityService{
+    /*generatedStart*/
+    List<GroupActivity> getGroupActivityList(GroupActivity record);
+
+    List<GroupActivity> getGroupActivityByPage(Page page, GroupActivity record);
+
+    GroupActivity getGroupActivityById(String id);
+
+    GroupActivity getGroupActivity(GroupActivity record);
+
+    boolean createGroupActivity(GroupActivity record);
+
+    boolean deleteGroupActivity(GroupActivity record);
+
+    boolean updateGroupActivity(GroupActivity record);
+    /*generatedEnd*/
+}
+

+ 28 - 0
src/main/java/com/izouma/awesomeadmin/service/GroupInfoService.java

@@ -0,0 +1,28 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.GroupInfo;
+
+
+/**
+*  service接口类
+*/
+public interface GroupInfoService{
+    /*generatedStart*/
+    List<GroupInfo> getGroupInfoList(GroupInfo record);
+
+    List<GroupInfo> getGroupInfoByPage(Page page, GroupInfo record);
+
+    GroupInfo getGroupInfoById(String id);
+
+    GroupInfo getGroupInfo(GroupInfo record);
+
+    boolean createGroupInfo(GroupInfo record);
+
+    boolean deleteGroupInfo(GroupInfo record);
+
+    boolean updateGroupInfo(GroupInfo record);
+    /*generatedEnd*/
+}
+

+ 28 - 0
src/main/java/com/izouma/awesomeadmin/service/GroupMemberService.java

@@ -0,0 +1,28 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.GroupMember;
+
+
+/**
+*  service接口类
+*/
+public interface GroupMemberService{
+    /*generatedStart*/
+    List<GroupMember> getGroupMemberList(GroupMember record);
+
+    List<GroupMember> getGroupMemberByPage(Page page, GroupMember record);
+
+    GroupMember getGroupMemberById(String id);
+
+    GroupMember getGroupMember(GroupMember record);
+
+    boolean createGroupMember(GroupMember record);
+
+    boolean deleteGroupMember(GroupMember record);
+
+    boolean updateGroupMember(GroupMember record);
+    /*generatedEnd*/
+}
+

+ 117 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/GroupActivityServiceImpl.java

@@ -0,0 +1,117 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.GroupActivity;
+import com.izouma.awesomeadmin.service.GroupActivityService;
+import com.izouma.awesomeadmin.dao.GroupActivityMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class GroupActivityServiceImpl implements GroupActivityService{
+    /*generatedStart*/
+    private static Logger logger = Logger.getLogger(GroupActivityServiceImpl.class);
+
+    @Autowired
+    private GroupActivityMapper groupActivityMapper;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @Override
+    public List<GroupActivity> getGroupActivityList(GroupActivity record) {
+        logger.info("getGroupActivityList");
+        try {
+            return groupActivityMapper.queryAllGroupActivity(record);
+        } catch (Exception e) {
+            logger.error("getGroupActivityList", e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<GroupActivity> getGroupActivityByPage(Page page, GroupActivity record) {
+        logger.info("getGroupActivityByPage");
+        try {
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return groupActivityMapper.queryGroupActivityByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getGroupActivityByPage", e);
+        }
+        return null;
+    }
+
+    @Override
+    public GroupActivity getGroupActivityById(String id) {
+        logger.info("getGroupActivityyId");
+        try {
+            return groupActivityMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            logger.error("getGroupActivityById", e);
+        }
+        return null;
+    }
+
+    @Override
+    public GroupActivity getGroupActivity(GroupActivity record) {
+        logger.info("getGroupActivity");
+        try {
+            return groupActivityMapper.queryGroupActivity(record);
+        } catch (Exception e) {
+            logger.error("getGroupActivity", e);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean createGroupActivity(GroupActivity record) {
+        logger.info("createGroupActivity");
+        try {
+            int updates = groupActivityMapper.insertSelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createGroupActivity", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean deleteGroupActivity(GroupActivity record) {
+        logger.info("deleteGroupActivity");
+        try {
+            int updates = groupActivityMapper.delete(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteGroupActivity", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean updateGroupActivity(GroupActivity record) {
+        logger.info("updateGroupActivity");
+        try {
+            int updates = groupActivityMapper.updateByPrimaryKeySelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateGroupActivity", e);
+        }
+        return false;
+    }
+    /*generatedEnd*/
+}
+

+ 117 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/GroupInfoServiceImpl.java

@@ -0,0 +1,117 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.GroupInfo;
+import com.izouma.awesomeadmin.service.GroupInfoService;
+import com.izouma.awesomeadmin.dao.GroupInfoMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class GroupInfoServiceImpl implements GroupInfoService{
+    /*generatedStart*/
+    private static Logger logger = Logger.getLogger(GroupInfoServiceImpl.class);
+
+    @Autowired
+    private GroupInfoMapper groupInfoMapper;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @Override
+    public List<GroupInfo> getGroupInfoList(GroupInfo record) {
+        logger.info("getGroupInfoList");
+        try {
+            return groupInfoMapper.queryAllGroupInfo(record);
+        } catch (Exception e) {
+            logger.error("getGroupInfoList", e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<GroupInfo> getGroupInfoByPage(Page page, GroupInfo record) {
+        logger.info("getGroupInfoByPage");
+        try {
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return groupInfoMapper.queryGroupInfoByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getGroupInfoByPage", e);
+        }
+        return null;
+    }
+
+    @Override
+    public GroupInfo getGroupInfoById(String id) {
+        logger.info("getGroupInfoyId");
+        try {
+            return groupInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            logger.error("getGroupInfoById", e);
+        }
+        return null;
+    }
+
+    @Override
+    public GroupInfo getGroupInfo(GroupInfo record) {
+        logger.info("getGroupInfo");
+        try {
+            return groupInfoMapper.queryGroupInfo(record);
+        } catch (Exception e) {
+            logger.error("getGroupInfo", e);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean createGroupInfo(GroupInfo record) {
+        logger.info("createGroupInfo");
+        try {
+            int updates = groupInfoMapper.insertSelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createGroupInfo", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean deleteGroupInfo(GroupInfo record) {
+        logger.info("deleteGroupInfo");
+        try {
+            int updates = groupInfoMapper.delete(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteGroupInfo", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean updateGroupInfo(GroupInfo record) {
+        logger.info("updateGroupInfo");
+        try {
+            int updates = groupInfoMapper.updateByPrimaryKeySelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateGroupInfo", e);
+        }
+        return false;
+    }
+    /*generatedEnd*/
+}
+

+ 117 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/GroupMemberServiceImpl.java

@@ -0,0 +1,117 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.GroupMember;
+import com.izouma.awesomeadmin.service.GroupMemberService;
+import com.izouma.awesomeadmin.dao.GroupMemberMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class GroupMemberServiceImpl implements GroupMemberService{
+    /*generatedStart*/
+    private static Logger logger = Logger.getLogger(GroupMemberServiceImpl.class);
+
+    @Autowired
+    private GroupMemberMapper groupMemberMapper;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @Override
+    public List<GroupMember> getGroupMemberList(GroupMember record) {
+        logger.info("getGroupMemberList");
+        try {
+            return groupMemberMapper.queryAllGroupMember(record);
+        } catch (Exception e) {
+            logger.error("getGroupMemberList", e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<GroupMember> getGroupMemberByPage(Page page, GroupMember record) {
+        logger.info("getGroupMemberByPage");
+        try {
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return groupMemberMapper.queryGroupMemberByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getGroupMemberByPage", e);
+        }
+        return null;
+    }
+
+    @Override
+    public GroupMember getGroupMemberById(String id) {
+        logger.info("getGroupMemberyId");
+        try {
+            return groupMemberMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            logger.error("getGroupMemberById", e);
+        }
+        return null;
+    }
+
+    @Override
+    public GroupMember getGroupMember(GroupMember record) {
+        logger.info("getGroupMember");
+        try {
+            return groupMemberMapper.queryGroupMember(record);
+        } catch (Exception e) {
+            logger.error("getGroupMember", e);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean createGroupMember(GroupMember record) {
+        logger.info("createGroupMember");
+        try {
+            int updates = groupMemberMapper.insertSelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createGroupMember", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean deleteGroupMember(GroupMember record) {
+        logger.info("deleteGroupMember");
+        try {
+            int updates = groupMemberMapper.delete(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteGroupMember", e);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean updateGroupMember(GroupMember record) {
+        logger.info("updateGroupMember");
+        try {
+            int updates = groupMemberMapper.updateByPrimaryKeySelective(record);
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateGroupMember", e);
+        }
+        return false;
+    }
+    /*generatedEnd*/
+}
+

+ 140 - 0
src/main/java/com/izouma/awesomeadmin/web/GroupActivityController.java

@@ -0,0 +1,140 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.GroupActivity;
+import com.izouma.awesomeadmin.service.GroupActivityService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/groupActivity")
+public class GroupActivityController {
+    /*generatedStart*/
+    @Autowired
+    private GroupActivityService groupActivityService;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(GroupActivity record) {
+        List<GroupActivity> pp = groupActivityService.getGroupActivityList(record);
+        return new Result(true, pp);
+    }
+
+    @RequestMapping(value = "/getGroupActivity", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getGroupActivity(@RequestParam(required = false, value = "id") String id) {
+        GroupActivity data = groupActivityService.getGroupActivityById(id);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(GroupActivity record) {
+        GroupActivity data = groupActivityService.getGroupActivity(record);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, GroupActivity record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<GroupActivity> pp =groupActivityService.getGroupActivityByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(GroupActivity record) {
+        boolean num = groupActivityService.createGroupActivity(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateGroupActivity(GroupActivity record) {
+        boolean num = groupActivityService.updateGroupActivity(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteGroupActivity(GroupActivity record) {
+
+        boolean num = groupActivityService.deleteGroupActivity(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, GroupActivity record) throws Exception {
+
+        List<GroupActivity> groupActivitys = groupActivityService.getGroupActivityList(record);
+
+        String sheetName = "group_activity";
+        String titleName = "拼团活动数据表";
+        String fileName = "拼团活动表";
+        int columnNumber = 24;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "id" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "团类型" ,   "名称" ,   "店铺ID" ,   "商品" ,   "sku标识" ,   "skuId" ,   "当前数量" ,   "当前数量" ,   "折扣价格" ,   "原始价格" ,   "成团人数" ,   "团队天数" ,   "开始时间" ,   "结束时间" ,   "图片" ,   "状态" ,   "备注" ,   "排序"  };
+        String[][] dataList = new String[groupActivitys.size()][24];
+
+        for (int i = 0; i < groupActivitys.size(); i++) {
+                        dataList[i][0] = String.valueOf(groupActivitys.get(i).getId());
+                        dataList[i][1] = String.valueOf(groupActivitys.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(groupActivitys.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(groupActivitys.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(groupActivitys.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(groupActivitys.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(groupActivitys.get(i).getGroupType());
+                        dataList[i][7] = String.valueOf(groupActivitys.get(i).getGroupName());
+                        dataList[i][8] = String.valueOf(groupActivitys.get(i).getStoreId());
+                        dataList[i][9] = String.valueOf(groupActivitys.get(i).getProductId());
+                        dataList[i][10] = String.valueOf(groupActivitys.get(i).getSkuFlag());
+                        dataList[i][11] = String.valueOf(groupActivitys.get(i).getSkuId());
+                        dataList[i][12] = String.valueOf(groupActivitys.get(i).getTotalAmount());
+                        dataList[i][13] = String.valueOf(groupActivitys.get(i).getCurrentAmount());
+                        dataList[i][14] = String.valueOf(groupActivitys.get(i).getDiscountPrice());
+                        dataList[i][15] = String.valueOf(groupActivitys.get(i).getOriginalPrice());
+                        dataList[i][16] = String.valueOf(groupActivitys.get(i).getGroupNumber());
+                        dataList[i][17] = String.valueOf(groupActivitys.get(i).getGroupDays());
+                        dataList[i][18] = String.valueOf(groupActivitys.get(i).getBeginTime());
+                        dataList[i][19] = String.valueOf(groupActivitys.get(i).getEndTime());
+                        dataList[i][20] = String.valueOf(groupActivitys.get(i).getImage());
+                        dataList[i][21] = String.valueOf(groupActivitys.get(i).getStatusFlag());
+                        dataList[i][22] = String.valueOf(groupActivitys.get(i).getRemark());
+                        dataList[i][23] = String.valueOf(groupActivitys.get(i).getRank());
+                    }
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+    }
+    /*generatedEnd*/
+}
+

+ 132 - 0
src/main/java/com/izouma/awesomeadmin/web/GroupInfoController.java

@@ -0,0 +1,132 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.GroupInfo;
+import com.izouma.awesomeadmin.service.GroupInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/groupInfo")
+public class GroupInfoController {
+    /*generatedStart*/
+    @Autowired
+    private GroupInfoService groupInfoService;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(GroupInfo record) {
+        List<GroupInfo> pp = groupInfoService.getGroupInfoList(record);
+        return new Result(true, pp);
+    }
+
+    @RequestMapping(value = "/getGroupInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getGroupInfo(@RequestParam(required = false, value = "id") String id) {
+        GroupInfo data = groupInfoService.getGroupInfoById(id);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(GroupInfo record) {
+        GroupInfo data = groupInfoService.getGroupInfo(record);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, GroupInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<GroupInfo> pp =groupInfoService.getGroupInfoByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(GroupInfo record) {
+        boolean num = groupInfoService.createGroupInfo(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateGroupInfo(GroupInfo record) {
+        boolean num = groupInfoService.updateGroupInfo(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteGroupInfo(GroupInfo record) {
+
+        boolean num = groupInfoService.deleteGroupInfo(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, GroupInfo record) throws Exception {
+
+        List<GroupInfo> groupInfos = groupInfoService.getGroupInfoList(record);
+
+        String sheetName = "group_info";
+        String titleName = "组团信息数据表";
+        String fileName = "组团信息表";
+        int columnNumber = 16;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "id" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "商品Id" ,   "用户Id" ,   "店铺Id" ,   "活动Id" ,   "开始时间" ,   "结束时间" ,   "团队人员" ,   "限制人数" ,   "状态" ,   "备注"  };
+        String[][] dataList = new String[groupInfos.size()][16];
+
+        for (int i = 0; i < groupInfos.size(); i++) {
+                        dataList[i][0] = String.valueOf(groupInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(groupInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(groupInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(groupInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(groupInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(groupInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(groupInfos.get(i).getProductId());
+                        dataList[i][7] = String.valueOf(groupInfos.get(i).getUserId());
+                        dataList[i][8] = String.valueOf(groupInfos.get(i).getStoreId());
+                        dataList[i][9] = String.valueOf(groupInfos.get(i).getGroupActivityId());
+                        dataList[i][10] = String.valueOf(groupInfos.get(i).getBeginTime());
+                        dataList[i][11] = String.valueOf(groupInfos.get(i).getEndTime());
+                        dataList[i][12] = String.valueOf(groupInfos.get(i).getTeamNumber());
+                        dataList[i][13] = String.valueOf(groupInfos.get(i).getLimitNumber());
+                        dataList[i][14] = String.valueOf(groupInfos.get(i).getStatusFlag());
+                        dataList[i][15] = String.valueOf(groupInfos.get(i).getRemark());
+                    }
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+    }
+    /*generatedEnd*/
+}
+

+ 130 - 0
src/main/java/com/izouma/awesomeadmin/web/GroupMemberController.java

@@ -0,0 +1,130 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.GroupMember;
+import com.izouma.awesomeadmin.service.GroupMemberService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/groupMember")
+public class GroupMemberController {
+    /*generatedStart*/
+    @Autowired
+    private GroupMemberService groupMemberService;
+    /*generatedEnd*/
+
+    /*generatedStart*/
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(GroupMember record) {
+        List<GroupMember> pp = groupMemberService.getGroupMemberList(record);
+        return new Result(true, pp);
+    }
+
+    @RequestMapping(value = "/getGroupMember", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getGroupMember(@RequestParam(required = false, value = "id") String id) {
+        GroupMember data = groupMemberService.getGroupMemberById(id);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(GroupMember record) {
+        GroupMember data = groupMemberService.getGroupMember(record);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, GroupMember record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<GroupMember> pp =groupMemberService.getGroupMemberByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(GroupMember record) {
+        boolean num = groupMemberService.createGroupMember(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateGroupMember(GroupMember record) {
+        boolean num = groupMemberService.updateGroupMember(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteGroupMember(GroupMember record) {
+
+        boolean num = groupMemberService.deleteGroupMember(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, GroupMember record) throws Exception {
+
+        List<GroupMember> groupMembers = groupMemberService.getGroupMemberList(record);
+
+        String sheetName = "group_member";
+        String titleName = "拼团成员数据表";
+        String fileName = "拼团成员表";
+        int columnNumber = 14;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "商品id" ,   "店铺id" ,   "用户id" ,   "拼团Id" ,   "拼团活动id" ,   "订单id" ,   "备注" ,   "状态"  };
+        String[][] dataList = new String[groupMembers.size()][14];
+
+        for (int i = 0; i < groupMembers.size(); i++) {
+                        dataList[i][0] = String.valueOf(groupMembers.get(i).getId());
+                        dataList[i][1] = String.valueOf(groupMembers.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(groupMembers.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(groupMembers.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(groupMembers.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(groupMembers.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(groupMembers.get(i).getProductId());
+                        dataList[i][7] = String.valueOf(groupMembers.get(i).getStoreId());
+                        dataList[i][8] = String.valueOf(groupMembers.get(i).getUserId());
+                        dataList[i][9] = String.valueOf(groupMembers.get(i).getGroupInfoId());
+                        dataList[i][10] = String.valueOf(groupMembers.get(i).getGroupActivityId());
+                        dataList[i][11] = String.valueOf(groupMembers.get(i).getOrderId());
+                        dataList[i][12] = String.valueOf(groupMembers.get(i).getRemark());
+                        dataList[i][13] = String.valueOf(groupMembers.get(i).getStatusFlag());
+                    }
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+    }
+    /*generatedEnd*/
+}
+

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 89 - 0
src/main/vue/src/pages/GroupActivity.vue


+ 680 - 0
src/main/vue/src/pages/GroupActivitys.vue

@@ -0,0 +1,680 @@
+<template>
+    <div>
+        <div class="filters-container">
+        
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/groupActivity',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table
+                :data="tableData"
+                :height="tableHeight"
+                row-key="id"
+                ref="table">
+            <el-table-column
+                    v-if="multipleMode"
+                    align="center"
+                    type="selection"
+                    width="50">
+            </el-table-column>
+            <el-table-column
+                    type="index"
+                    min-width="50"
+                    align="center">
+            </el-table-column>
+                                                                                                                                                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('groupType')"
+                                prop="groupType"
+                                label="团类型"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('groupName')"
+                                prop="groupName"
+                                label="名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('storeId')"
+                                prop="storeId"
+                                label="店铺ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('productId')"
+                                prop="productId"
+                                label="商品"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('skuFlag')"
+                                prop="skuFlag"
+                                label="sku标识"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('skuId')"
+                                prop="skuId"
+                                label="skuId"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('totalAmount')"
+                                prop="totalAmount"
+                                label="当前数量"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('currentAmount')"
+                                prop="currentAmount"
+                                label="当前数量"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('discountPrice')"
+                                prop="discountPrice"
+                                label="折扣价格"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('originalPrice')"
+                                prop="originalPrice"
+                                label="原始价格"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('groupNumber')"
+                                prop="groupNumber"
+                                label="成团人数"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('groupDays')"
+                                prop="groupDays"
+                                label="团队天数"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('beginTime')"
+                                prop="beginTime"
+                                label="开始时间"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('endTime')"
+                                prop="endTime"
+                                label="结束时间"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('image')"
+                                prop="image"
+                                label="图片"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('statusFlag')"
+                                prop="statusFlag"
+                                label="状态"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('rank')"
+                                prop="rank"
+                                label="排序"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        name: 'GroupActivitys',
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '团类型',
+                                value: 'groupType',
+                                show: true
+                            },
+                                                                                                {
+                                label: '名称',
+                                value: 'groupName',
+                                show: true
+                            },
+                                                                                                {
+                                label: '店铺ID',
+                                value: 'storeId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '商品',
+                                value: 'productId',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'sku标识',
+                                value: 'skuFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'skuId',
+                                value: 'skuId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '当前数量',
+                                value: 'totalAmount',
+                                show: true
+                            },
+                                                                                                {
+                                label: '当前数量',
+                                value: 'currentAmount',
+                                show: true
+                            },
+                                                                                                {
+                                label: '折扣价格',
+                                value: 'discountPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '原始价格',
+                                value: 'originalPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '成团人数',
+                                value: 'groupNumber',
+                                show: true
+                            },
+                                                                                                {
+                                label: '团队天数',
+                                value: 'groupDays',
+                                show: true
+                            },
+                                                                                                {
+                                label: '开始时间',
+                                value: 'beginTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '结束时间',
+                                value: 'endTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '图片',
+                                value: 'image',
+                                show: true
+                            },
+                                                                                                {
+                                label: '状态',
+                                value: 'statusFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: '排序',
+                                value: 'rank',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '团类型',
+                                value: 'group_type'
+                            },
+                                                                                                {
+                                label: '名称',
+                                value: 'group_name'
+                            },
+                                                                                                {
+                                label: '店铺ID',
+                                value: 'store_id'
+                            },
+                                                                                                {
+                                label: '商品',
+                                value: 'product_id'
+                            },
+                                                                                                {
+                                label: 'sku标识',
+                                value: 'sku_flag'
+                            },
+                                                                                                {
+                                label: 'skuId',
+                                value: 'sku_id'
+                            },
+                                                                                                {
+                                label: '当前数量',
+                                value: 'total_amount'
+                            },
+                                                                                                {
+                                label: '当前数量',
+                                value: 'current_amount'
+                            },
+                                                                                                {
+                                label: '折扣价格',
+                                value: 'discount_price'
+                            },
+                                                                                                {
+                                label: '原始价格',
+                                value: 'original_price'
+                            },
+                                                                                                {
+                                label: '成团人数',
+                                value: 'group_number'
+                            },
+                                                                                                {
+                                label: '团队天数',
+                                value: 'group_days'
+                            },
+                                                                                                {
+                                label: '开始时间',
+                                value: 'begin_time'
+                            },
+                                                                                                {
+                                label: '结束时间',
+                                value: 'end_time'
+                            },
+                                                                                                {
+                                label: '图片',
+                                value: 'image'
+                            },
+                                                                                                {
+                                label: '状态',
+                                value: 'status_flag'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: '排序',
+                                value: 'rank'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/groupActivity/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/groupActivity',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
+
+                this.advancedQuerySearchKey = '';
+
+                if (this.advancedQueryFields.length > 0) {
+
+                    var templist = [];
+
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
+
+                this.orderByStr = '';
+
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/groupActivity/exportExcel?searchKey="
+                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/groupActivity/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
+
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
+
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
+
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

+ 175 - 0
src/main/vue/src/pages/GroupInfo.vue

@@ -0,0 +1,175 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
+                 style="max-width: 500px;">
+            <el-form-item prop="productId" label="商品Id">
+                <el-input v-model="formData.productId" :disabled="'productId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="userId" label="用户Id">
+                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="storeId" label="店铺Id">
+                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="groupActivityId" label="活动Id">
+                <el-input v-model="formData.groupActivityId" :disabled="'groupActivityId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="beginTime" label="开始时间">
+                <el-input v-model="formData.beginTime" :disabled="'beginTime'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="endTime" label="结束时间">
+                <el-input v-model="formData.endTime" :disabled="'endTime'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="teamNumber" label="团队人员">
+                <el-input v-model="formData.teamNumber" :disabled="'teamNumber'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="limitNumber" label="限制人数">
+                <el-input v-model="formData.limitNumber" :disabled="'limitNumber'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="statusFlag" label="状态">
+                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+    import { mapState } from 'vuex'
+    import { format } from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        name: 'GroupInfo',
+        created() {
+
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/groupInfo/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                this.formData = res.data;
+                        if (this.$route.query.column) {
+                            this.formData[this.subColumn] = this.subValue;
+                        }
+                    }
+                })
+            } else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+                subColumn: '',
+                subValue: '',
+            }
+        },
+        computed: {
+            ...mapState(['userInfo']),
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.logicalValidate();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            logicalValidate() {
+                let logicalData = {
+                };
+
+                if (JSON.stringify(logicalData) == '{}') {
+                    this.submit();
+                } else {
+                    this.$http.get({
+                        url: '/groupInfo/getOne',
+                        data: logicalData
+                    }).then(res => {
+                        if (res.success) {
+                            let logicalFlag = true;
+                            if (res.data) {
+                                if (this.formData.id) {
+                                    if (res.data.id != this.formData.id) {
+                                        logicalFlag = false;
+                                    }
+                                } else {
+                                    logicalFlag = false;
+                                }
+                            }
+
+                            if (logicalFlag) {
+                                this.submit();
+                            } else {
+                                this.$message.warning('逻辑关键字:'+''+'验证失败')
+                            }
+
+                        } else {
+                            this.$message.warning('逻辑关键字:'+''+'验证失败')
+                        }
+                    });
+                }
+            },
+            submit() {
+                let data = {...this.formData};
+
+                                                                                                                                                                                                                                                                                
+                this.$http.post({
+                    url: this.formData.id ? '/groupInfo/update' : '/groupInfo/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                        url: '/groupInfo/del',
+                        data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

+ 552 - 0
src/main/vue/src/pages/GroupInfos.vue

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

+ 169 - 0
src/main/vue/src/pages/GroupMember.vue

@@ -0,0 +1,169 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
+                 style="max-width: 500px;">
+            <el-form-item prop="productId" label="商品id">
+                <el-input v-model="formData.productId" :disabled="'productId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="storeId" label="店铺id">
+                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="userId" label="用户id">
+                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="groupInfoId" label="拼团Id">
+                <el-input v-model="formData.groupInfoId" :disabled="'groupInfoId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="groupActivityId" label="拼团活动id">
+                <el-input v-model="formData.groupActivityId" :disabled="'groupActivityId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="orderId" label="订单id">
+                <el-input v-model="formData.orderId" :disabled="'orderId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="statusFlag" label="状态">
+                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+    import { mapState } from 'vuex'
+    import { format } from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        name: 'GroupMember',
+        created() {
+
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/groupMember/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        this.formData = res.data;
+                        if (this.$route.query.column) {
+                            this.formData[this.subColumn] = this.subValue;
+                        }
+                    }
+                })
+            } else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+                subColumn: '',
+                subValue: '',
+            }
+        },
+        computed: {
+            ...mapState(['userInfo']),
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.logicalValidate();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            logicalValidate() {
+                let logicalData = {
+                };
+
+                if (JSON.stringify(logicalData) == '{}') {
+                    this.submit();
+                } else {
+                    this.$http.get({
+                        url: '/groupMember/getOne',
+                        data: logicalData
+                    }).then(res => {
+                        if (res.success) {
+                            let logicalFlag = true;
+                            if (res.data) {
+                                if (this.formData.id) {
+                                    if (res.data.id != this.formData.id) {
+                                        logicalFlag = false;
+                                    }
+                                } else {
+                                    logicalFlag = false;
+                                }
+                            }
+
+                            if (logicalFlag) {
+                                this.submit();
+                            } else {
+                                this.$message.warning('逻辑关键字:'+''+'验证失败')
+                            }
+
+                        } else {
+                            this.$message.warning('逻辑关键字:'+''+'验证失败')
+                        }
+                    });
+                }
+            },
+            submit() {
+                let data = {...this.formData};
+
+                                                                                                                                                                                                                                                
+                this.$http.post({
+                    url: this.formData.id ? '/groupMember/update' : '/groupMember/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                        url: '/groupMember/del',
+                        data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

+ 520 - 0
src/main/vue/src/pages/GroupMembers.vue

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

+ 30 - 0
src/main/vue/src/router/index.js

@@ -617,6 +617,36 @@ const router = new Router({
                     path: '/productSkus',
                     name: 'ProductSkus',
                     component: () => import('../pages/ProductSkus')
+                },
+                {
+                    path: '/groupActivity',
+                    name: 'GroupActivity',
+                    component: () => import('../pages/GroupActivity')
+                },
+                {
+                    path: '/groupActivitys',
+                    name: 'GroupActivitys',
+                    component: () => import('../pages/GroupActivitys')
+                },
+                {
+                    path: '/groupInfo',
+                    name: 'GroupInfo',
+                    component: () => import('../pages/GroupInfo')
+                },
+                {
+                    path: '/groupInfos',
+                    name: 'GroupInfos',
+                    component: () => import('../pages/GroupInfos')
+                },
+                {
+                    path: '/groupMember',
+                    name: 'GroupMember',
+                    component: () => import('../pages/GroupMember')
+                },
+                {
+                    path: '/groupMembers',
+                    name: 'GroupMembers',
+                    component: () => import('../pages/GroupMembers')
                 }
                 /**INSERT_LOCATION**/
         ]

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels