admin
2020-12-03 55f808742eb4117dbb840955cb11bb9b9ae4f04c
天天抽奖mapper完善
7个文件已删除
20个文件已修改
1个文件已添加
2136 ■■■■ 已修改文件
service-daylucky/src/main/java/com/ks/daylucky/exception/UserInfoExtraException.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/ActivityScanRecordMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/AnnouncementMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/AppConfigMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/LuckyActivityAwardResultExtraMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/MsgTypeConfigMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/UserInfoExtraMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/UserInfoMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/mapper/UserMsgMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/DO/LuckyMQ.java 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/DO/UserInfo.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ActivityMQMsg.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/UserMsgSettings.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoExtraService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoExtraServiceImpl.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/mq/CMQConsumeRunner.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/mq/CMQManager.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/util/mq/LuckyMQFactory.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/ActivityScanRecordMapper.xml 201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/ActivityTagMapper.xml 216 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/AnnouncementMapper.xml 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/AppConfigMapper.xml 291 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/MsgTypeConfigMapper.xml 240 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/UserInfoExtraMapper.xml 158 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/UserInfoMapper.xml 381 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/mapper/UserMsgMapper.xml 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/util/mq/consume/AcitivtyConsumer.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/exception/UserInfoExtraException.java
New file
@@ -0,0 +1,11 @@
package com.ks.daylucky.exception;
import com.ks.lib.common.exception.BaseException;
public class UserInfoExtraException extends BaseException {
    public UserInfoExtraException(int code, String msg) {
        super(code, msg);
    }
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/ActivityScanRecordMapper.java
@@ -3,13 +3,14 @@
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.daylucky.query.ActivityScanQuery;
import com.ks.lib.common.dao.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ActivityScanRecordMapper extends BaseMapper<ActivityScanRecord> {
    List<ActivityScanRecord> list(ActivityScanQuery query);
    List<ActivityScanRecord> list(@Param("query") ActivityScanQuery query);
    long count(ActivityScanQuery query);
    long count(@Param("query")ActivityScanQuery query);
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/AnnouncementMapper.java
@@ -3,11 +3,14 @@
import com.ks.daylucky.pojo.DO.Announcement;
import com.ks.daylucky.query.AnnouncementQuery;
import com.ks.lib.common.dao.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface AnnouncementMapper extends BaseMapper<Announcement> {
     List<Announcement> list(AnnouncementQuery query);
    List<Announcement> list(@Param("query") AnnouncementQuery query);
    long count(@Param("query") AnnouncementQuery query);
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/AppConfigMapper.java
@@ -3,12 +3,13 @@
import com.ks.daylucky.pojo.DO.AppConfig;
import com.ks.daylucky.query.AppConfigQuery;
import com.ks.lib.common.dao.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface AppConfigMapper extends BaseMapper<AppConfig> {
    List<AppConfig> list(AppConfigQuery query);
    List<AppConfig> list(@Param("query") AppConfigQuery query);
    long count(AppConfigQuery query);
    long count(@Param("query") AppConfigQuery query);
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/LuckyActivityAwardResultExtraMapper.java
File was deleted
service-daylucky/src/main/java/com/ks/daylucky/mapper/MsgTypeConfigMapper.java
@@ -3,11 +3,14 @@
import com.ks.daylucky.pojo.DO.MsgTypeConfig;
import com.ks.daylucky.query.MsgTypeConfigQuery;
import com.ks.lib.common.dao.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface MsgTypeConfigMapper extends BaseMapper<MsgTypeConfig> {
    List<MsgTypeConfig> list(MsgTypeConfigQuery query);
    List<MsgTypeConfig> list(@Param("query") MsgTypeConfigQuery query);
    long count(@Param("query") MsgTypeConfigQuery query);
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/UserInfoExtraMapper.java
@@ -4,5 +4,7 @@
import com.ks.lib.common.dao.BaseMapper;
public interface UserInfoExtraMapper extends BaseMapper<UserInfoExtra> {
    UserInfoExtra selectByPrimaryKeyForUpdate(Long uid);
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/UserInfoMapper.java
@@ -1,8 +1,16 @@
package com.ks.daylucky.mapper;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.query.UserInfoQuery;
import com.ks.lib.common.dao.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface UserInfoMapper extends BaseMapper<UserInfo> {
    List<UserInfo> list(@Param("query") UserInfoQuery query);
    long count(@Param("query") UserInfoQuery query);
}
service-daylucky/src/main/java/com/ks/daylucky/mapper/UserMsgMapper.java
@@ -3,12 +3,13 @@
import com.ks.daylucky.pojo.DO.UserMsg;
import com.ks.daylucky.query.UserMsgQuery;
import com.ks.lib.common.dao.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface UserMsgMapper extends BaseMapper<UserMsg> {
    List<UserMsg> list(UserMsgQuery query);
    List<UserMsg> list(@Param("query") UserMsgQuery query);
    long count(UserMsgQuery query);
    long count(@Param("query") UserMsgQuery query);
}
service-daylucky/src/main/java/com/ks/daylucky/pojo/DO/LuckyMQ.java
File was deleted
service-daylucky/src/main/java/com/ks/daylucky/pojo/DO/UserInfo.java
@@ -1,12 +1,14 @@
package com.ks.daylucky.pojo.DO;
import javax.validation.constraints.NotNull;
import java.util.Date;
public class UserInfo {
    private Long id;
    @NotNull(message = "应用ID不能为空")
    private Long appId;
    @NotNull(message = "应用唯一标识不能为空")
    private String identifyCode;
    private String nickName;
@@ -29,6 +31,17 @@
    private Date updateTime;
    private UserInfoExtra userInfoExtra;
    public UserInfoExtra getUserInfoExtra() {
        return userInfoExtra;
    }
    public void setUserInfoExtra(UserInfoExtra userInfoExtra) {
        this.userInfoExtra = userInfoExtra;
    }
    public Long getId() {
        return id;
    }
service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/ActivityMQMsg.java
File was deleted
service-daylucky/src/main/java/com/ks/daylucky/pojo/DTO/UserMsgSettings.java
@@ -1,4 +1,20 @@
package com.ks.daylucky.pojo.DTO;
import com.google.gson.Gson;
import org.yeshi.utils.StringUtil;
public class UserMsgSettings {
    @Override
    public String toString() {
        return new Gson().toJson(this);
    }
    public static UserMsgSettings parse(String settings) {
        if (StringUtil.isNullOrEmpty(settings)) {
            settings = "{}";
        }
        return new Gson().fromJson(settings, UserMsgSettings.class);
    }
}
service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoExtraService.java
@@ -1,10 +1,17 @@
package com.ks.daylucky.service;
import com.ks.daylucky.exception.UserInfoExtraException;
import com.ks.daylucky.pojo.DO.UserInfoExtra;
import com.ks.daylucky.pojo.DTO.UserMsgSettings;
public interface UserInfoExtraService {
    /**
     * 初始化
     * @param uid
     */
    public void init(Long uid);
    /**
     * 获取详情
@@ -19,14 +26,15 @@
     *
     * @param uid
     */
    public void setMsgRead(Long uid);
    public void setMsgRead(Long uid) throws UserInfoExtraException;
    /**
     * 消息设置
     *
     * @param uid
     * @param setting
     */
    public void setUserMsgSetting(UserMsgSettings setting);
    public void setUserMsgSetting(Long uid, UserMsgSettings setting);
    /**
     * 获取用户消息设置信息
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoExtraServiceImpl.java
@@ -1,5 +1,6 @@
package com.ks.daylucky.service.impl.remote;
import com.ks.daylucky.exception.UserInfoExtraException;
import com.ks.daylucky.mapper.UserInfoExtraMapper;
import com.ks.daylucky.pojo.DO.UserInfoExtra;
import com.ks.daylucky.pojo.DTO.UserMsgSettings;
@@ -7,6 +8,7 @@
import org.apache.dubbo.config.annotation.Service;
import javax.annotation.Resource;
import java.util.Date;
@Service(version = "1.0.0")
public class UserInfoExtraServiceImpl implements UserInfoExtraService {
@@ -16,22 +18,41 @@
    @Override
    public void init(Long uid) {
        UserInfoExtra extra = new UserInfoExtra();
        extra.setCreateTime(new Date());
        extra.setMsgSetting(new UserMsgSettings().toString());
        extra.setMsgUnreadCount(0);
        userInfoExtraMapper.insertSelective(extra);
    }
    @Override
    public UserInfoExtra getUserInfoExtra(Long uid) {
        return null;
        return userInfoExtraMapper.selectByPrimaryKey(uid);
    }
    @Override
    public void setMsgRead(Long uid) {
    public void setMsgRead(Long uid) throws UserInfoExtraException {
        UserInfoExtra extra = new UserInfoExtra();
        extra.setUid(uid);
        extra.setMsgUnreadCount(0);
        extra.setUpdateTime(new Date());
        userInfoExtraMapper.updateByPrimaryKeySelective(extra);
    }
    @Override
    public void setUserMsgSetting(UserMsgSettings setting) {
    public void setUserMsgSetting(Long uid, UserMsgSettings setting) {
        UserInfoExtra extra = new UserInfoExtra();
        extra.setUid(uid);
        extra.setMsgSetting(setting.toString());
        extra.setUpdateTime(new Date());
        userInfoExtraMapper.updateByPrimaryKeySelective(extra);
    }
    @Override
    public UserMsgSettings getUserMsgSettings(Long uid) {
        return null;
        UserInfoExtra userInfoExtra = userInfoExtraMapper.selectByPrimaryKeyForUpdate(uid);
        String msg = userInfoExtra.getMsgSetting();
        return UserMsgSettings.parse(msg);
    }
}
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
@@ -5,13 +5,16 @@
import com.ks.daylucky.mapper.UserInfoExtraMapper;
import com.ks.daylucky.mapper.UserInfoMapper;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.DO.UserInfoExtra;
import com.ks.daylucky.query.UserInfoQuery;
import com.ks.daylucky.service.UserInfoExtraService;
import com.ks.daylucky.service.UserInfoService;
import org.apache.dubbo.config.annotation.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
@Service(version = "1.0.0")
@@ -23,39 +26,81 @@
    @Resource
    private UserInfoExtraMapper userInfoExtraMapper;
    @Resource
    private UserInfoExtraService userInfoExtraService;
    @Override
    public UserInfo getUserInfo(Long appId, String identifyCode) {
        UserInfoQuery query = new UserInfoQuery();
        query.appId = appId;
        query.identifyCode = identifyCode;
        query.count = 1;
        List<UserInfo> list = userInfoMapper.list(query);
        if (list != null && list.size() > 0) {
            return list.get(0);
        }
        return null;
    }
    @Validated
    @Override
    public Long addUserInfo(@Valid UserInfo userInfo) throws ParameterException, UserInfoException {
        return null;
        UserInfo old = getUserInfo(userInfo.getAppId(), userInfo.getIdentifyCode());
        if (old != null) {
            throw new UserInfoException(UserInfoException.CODE_EXIST, "用户已存在");
        }
        if (userInfo.getCreateTime() != null) {
            userInfo.setCreateTime(new Date());
        }
        userInfoMapper.insertSelective(userInfo);
        //初始化附加信息
        userInfoExtraService.init(userInfo.getId());
        return userInfo.getId();
    }
    @Override
    public List<UserInfo> getUserList(UserInfoQuery query, int page, int pageSize) {
        return null;
        query.start = (page - 1) * pageSize;
        query.count = pageSize;
        return userInfoMapper.list(query);
    }
    @Override
    public long countUser(UserInfoQuery query) {
        return 0;
        return userInfoMapper.count(query);
    }
    @Override
    public UserInfo getUserDetail(Long appId, String identifyCode) {
        return null;
        UserInfo userInfo = getUserInfo(appId, identifyCode);
        if (userInfo == null) {
            return null;
        }
        UserInfoExtra extra = userInfoExtraMapper.selectByPrimaryKey(userInfo.getId());
        userInfo.setUserInfoExtra(extra);
        return userInfo;
    }
    @Override
    public UserInfo getUserDetail(Long id) {
        return null;
        UserInfo userInfo = userInfoMapper.selectByPrimaryKey(id);
        if (userInfo == null) {
            return null;
        }
        UserInfoExtra extra = userInfoExtraMapper.selectByPrimaryKey(userInfo.getId());
        userInfo.setUserInfoExtra(extra);
        return userInfo;
    }
    @Override
    public void updateUserInfo(UserInfo userInfo) {
        if (userInfo == null || userInfo.getId() == null) {
            return;
        }
        userInfo.setUpdateTime(new Date());
        userInfoMapper.updateByPrimaryKeySelective(userInfo);
    }
}
service-daylucky/src/main/java/com/ks/daylucky/util/mq/CMQConsumeRunner.java
File was deleted
service-daylucky/src/main/java/com/ks/daylucky/util/mq/CMQManager.java
File was deleted
service-daylucky/src/main/java/com/ks/daylucky/util/mq/LuckyMQFactory.java
File was deleted
service-daylucky/src/main/resources/mapper/ActivityScanRecordMapper.xml
@@ -1,88 +1,143 @@
<?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.ks.daylucky.mapper.ActivityScanRecordMapper" >
  <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.ActivityScanRecord" >
    <id column="id" property="id" jdbcType="BIGINT" />
    <result column="uid" property="uid" jdbcType="BIGINT" />
    <result column="activity_id" property="activityId" jdbcType="BIGINT" />
    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
  </resultMap>
  <sql id="Base_Column_List" >
<mapper namespace="com.ks.daylucky.mapper.ActivityScanRecordMapper">
    <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.ActivityScanRecord">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="uid" property="uid" jdbcType="BIGINT"/>
        <result column="activity_id" property="activityId" jdbcType="BIGINT"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
    id, uid, activity_id, create_time, update_time
  </sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
    select
    <include refid="Base_Column_List" />
    from activity_scan_record
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from activity_scan_record
        where id = #{id,jdbcType=BIGINT}
    </select>
    <!-- 非模板 -->
    <sql id="listWhere">
        <if test="query.activityId!=null">
            and activity_id=#{query.activityId}
        </if>
        <if test="query.uid!=null">
            and uid=#{query.uid}
        </if>
        <if test="query.minCreateTime!=null">
            and create_time>=#{query.minCreateTime}
        </if>
        <if test="query.maxCreateTime!=null">
            and #{query.maxCreateTime}>create_time
        </if>
    </sql>
    <select id="list" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from activity_scan_record
        where 1=1
        <include refid="listWhere">
        </include>
        <if test="query.sortList!=null">
            <foreach collection="query.sortList" item="item" separator="," open=" order by ">
                #{item}
            </foreach>
        </if>
        limit #{query.start},#{query.count}
    </select>
    <select id="count" resultType="java.lang.Long">
        select
        count(*)
        from activity_scan_record
        where 1=1
        <include refid="listWhere">
        </include>
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from activity_scan_record
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord" >
    <insert id="insert" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord">
    insert into activity_scan_record (id, uid, activity_id, 
      create_time, update_time)
    values (#{id,jdbcType=BIGINT}, #{uid,jdbcType=BIGINT}, #{activityId,jdbcType=BIGINT}, 
      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord" >
    insert into activity_scan_record
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        id,
      </if>
      <if test="uid != null" >
        uid,
      </if>
      <if test="activityId != null" >
        activity_id,
      </if>
      <if test="createTime != null" >
        create_time,
      </if>
      <if test="updateTime != null" >
        update_time,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        #{id,jdbcType=BIGINT},
      </if>
      <if test="uid != null" >
        #{uid,jdbcType=BIGINT},
      </if>
      <if test="activityId != null" >
        #{activityId,jdbcType=BIGINT},
      </if>
      <if test="createTime != null" >
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord" >
    update activity_scan_record
    <set >
      <if test="uid != null" >
        uid = #{uid,jdbcType=BIGINT},
      </if>
      <if test="activityId != null" >
        activity_id = #{activityId,jdbcType=BIGINT},
      </if>
      <if test="createTime != null" >
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord" >
    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord">
        insert into activity_scan_record
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">
                id,
            </if>
            <if test="uid != null">
                uid,
            </if>
            <if test="activityId != null">
                activity_id,
            </if>
            <if test="createTime != null">
                create_time,
            </if>
            <if test="updateTime != null">
                update_time,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">
                #{id,jdbcType=BIGINT},
            </if>
            <if test="uid != null">
                #{uid,jdbcType=BIGINT},
            </if>
            <if test="activityId != null">
                #{activityId,jdbcType=BIGINT},
            </if>
            <if test="createTime != null">
                #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord">
        update activity_scan_record
        <set>
            <if test="uid != null">
                uid = #{uid,jdbcType=BIGINT},
            </if>
            <if test="activityId != null">
                activity_id = #{activityId,jdbcType=BIGINT},
            </if>
            <if test="createTime != null">
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.ActivityScanRecord">
    update activity_scan_record
    set uid = #{uid,jdbcType=BIGINT},
      activity_id = #{activityId,jdbcType=BIGINT},
service-daylucky/src/main/resources/mapper/ActivityTagMapper.xml
@@ -1,31 +1,40 @@
<?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.ks.daylucky.mapper.ActivityTagMapper" >
  <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.ActivityTag" >
    <id column="id" property="id" jdbcType="BIGINT" />
    <result column="activity_id" property="activityId" jdbcType="BIGINT" />
    <result column="tag_name" property="tagName" jdbcType="VARCHAR" />
    <result column="tag_bg_color" property="tagBgColor" jdbcType="VARCHAR" />
    <result column="tag_font_colr" property="tagFontColr" jdbcType="VARCHAR" />
    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
    <result column="weight" property="weight" jdbcType="INTEGER" />
  </resultMap>
  <sql id="Base_Column_List" >
<mapper namespace="com.ks.daylucky.mapper.ActivityTagMapper">
    <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.ActivityTag">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="activity_id" property="activityId" jdbcType="BIGINT"/>
        <result column="tag_name" property="tagName" jdbcType="VARCHAR"/>
        <result column="tag_bg_color" property="tagBgColor" jdbcType="VARCHAR"/>
        <result column="tag_font_colr" property="tagFontColr" jdbcType="VARCHAR"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
        <result column="weight" property="weight" jdbcType="INTEGER"/>
    </resultMap>
    <sql id="Base_Column_List">
    id, activity_id, tag_name, tag_bg_color, tag_font_colr, create_time, update_time, 
    weight
  </sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
    select
    <include refid="Base_Column_List" />
    from activity_tag
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from activity_tag
        where id = #{id,jdbcType=BIGINT}
    </select>
    <select id="listByActivityId" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from activity_tag
        where activity_id = #{0}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from activity_tag
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.ActivityTag" >
    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.ks.daylucky.pojo.DO.ActivityTag">
    insert into activity_tag (id, activity_id, tag_name, 
      tag_bg_color, tag_font_colr, create_time, 
      update_time, weight)
@@ -33,89 +42,90 @@
      #{tagBgColor,jdbcType=VARCHAR}, #{tagFontColr,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
      #{updateTime,jdbcType=TIMESTAMP}, #{weight,jdbcType=INTEGER})
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.ActivityTag" >
    insert into activity_tag
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        id,
      </if>
      <if test="activityId != null" >
        activity_id,
      </if>
      <if test="tagName != null" >
        tag_name,
      </if>
      <if test="tagBgColor != null" >
        tag_bg_color,
      </if>
      <if test="tagFontColr != null" >
        tag_font_colr,
      </if>
      <if test="createTime != null" >
        create_time,
      </if>
      <if test="updateTime != null" >
        update_time,
      </if>
      <if test="weight != null" >
        weight,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        #{id,jdbcType=BIGINT},
      </if>
      <if test="activityId != null" >
        #{activityId,jdbcType=BIGINT},
      </if>
      <if test="tagName != null" >
        #{tagName,jdbcType=VARCHAR},
      </if>
      <if test="tagBgColor != null" >
        #{tagBgColor,jdbcType=VARCHAR},
      </if>
      <if test="tagFontColr != null" >
        #{tagFontColr,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="weight != null" >
        #{weight,jdbcType=INTEGER},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.ActivityTag" >
    update activity_tag
    <set >
      <if test="activityId != null" >
        activity_id = #{activityId,jdbcType=BIGINT},
      </if>
      <if test="tagName != null" >
        tag_name = #{tagName,jdbcType=VARCHAR},
      </if>
      <if test="tagBgColor != null" >
        tag_bg_color = #{tagBgColor,jdbcType=VARCHAR},
      </if>
      <if test="tagFontColr != null" >
        tag_font_colr = #{tagFontColr,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="weight != null" >
        weight = #{weight,jdbcType=INTEGER},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.ActivityTag" >
    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.ks.daylucky.pojo.DO.ActivityTag">
        insert into activity_tag
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">
                id,
            </if>
            <if test="activityId != null">
                activity_id,
            </if>
            <if test="tagName != null">
                tag_name,
            </if>
            <if test="tagBgColor != null">
                tag_bg_color,
            </if>
            <if test="tagFontColr != null">
                tag_font_colr,
            </if>
            <if test="createTime != null">
                create_time,
            </if>
            <if test="updateTime != null">
                update_time,
            </if>
            <if test="weight != null">
                weight,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">
                #{id,jdbcType=BIGINT},
            </if>
            <if test="activityId != null">
                #{activityId,jdbcType=BIGINT},
            </if>
            <if test="tagName != null">
                #{tagName,jdbcType=VARCHAR},
            </if>
            <if test="tagBgColor != null">
                #{tagBgColor,jdbcType=VARCHAR},
            </if>
            <if test="tagFontColr != null">
                #{tagFontColr,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                #{updateTime,jdbcType=TIMESTAMP},
            </if>
            <if test="weight != null">
                #{weight,jdbcType=INTEGER},
            </if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.ActivityTag">
        update activity_tag
        <set>
            <if test="activityId != null">
                activity_id = #{activityId,jdbcType=BIGINT},
            </if>
            <if test="tagName != null">
                tag_name = #{tagName,jdbcType=VARCHAR},
            </if>
            <if test="tagBgColor != null">
                tag_bg_color = #{tagBgColor,jdbcType=VARCHAR},
            </if>
            <if test="tagFontColr != null">
                tag_font_colr = #{tagFontColr,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
            <if test="weight != null">
                weight = #{weight,jdbcType=INTEGER},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.ActivityTag">
    update activity_tag
    set activity_id = #{activityId,jdbcType=BIGINT},
      tag_name = #{tagName,jdbcType=VARCHAR},
service-daylucky/src/main/resources/mapper/AnnouncementMapper.xml
@@ -19,6 +19,62 @@
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
        <include refid="Base_Column_List"/>from announcement where id = #{id,jdbcType=BIGINT}
    </select>
    <!-- 非模板 -->
    <sql id="listWhere">
        <if test="query.appId!=null">
            and app_id=#{query.appId}
        </if>
        <if test="query.type!=null">
            and type=#{query.type}
        </if>
        <if test="query.key!=null">
            and `name` like '${query.key}%'
        </if>
        <if test="query.minCreateTime!=null">
            and create_time>=#{query.minCreateTime}
        </if>
        <if test="query.maxCreateTime!=null">
            and #{query.maxCreateTime}>create_time
        </if>
    </sql>
    <select id="list" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from announcement
        where 1=1
        <include refid="listWhere">
        </include>
        <if test="query.sortList!=null">
            <foreach collection="query.sortList" item="item" separator="," open=" order by ">
                #{item}
            </foreach>
        </if>
        limit #{query.start},#{query.count}
    </select>
    <select id="count" resultType="java.lang.Long">
        select
        count(*)
        from announcement
        where 1=1
        <include refid="listWhere">
        </include>
    </select>
    <delete id="deleteByPrimaryKey"
            parameterType="java.lang.Long">delete from announcement where id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.Announcement" useGeneratedKeys="true"
service-daylucky/src/main/resources/mapper/AppConfigMapper.xml
@@ -1,31 +1,95 @@
<?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.ks.daylucky.mapper.AppConfigMapper" >
  <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.AppConfig" >
    <id column="id" property="id" jdbcType="BIGINT" />
    <result column="app_id" property="appId" jdbcType="BIGINT" />
    <result column="name" property="name" jdbcType="VARCHAR" />
    <result column="key" property="key" jdbcType="VARCHAR" />
    <result column="value" property="value" jdbcType="VARCHAR" />
    <result column="min_version" property="minVersion" jdbcType="INTEGER" />
    <result column="remarks" property="remarks" jdbcType="VARCHAR" />
    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
  </resultMap>
  <sql id="Base_Column_List" >
<mapper namespace="com.ks.daylucky.mapper.AppConfigMapper">
    <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.AppConfig">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="app_id" property="appId" jdbcType="BIGINT"/>
        <result column="name" property="name" jdbcType="VARCHAR"/>
        <result column="key" property="key" jdbcType="VARCHAR"/>
        <result column="value" property="value" jdbcType="VARCHAR"/>
        <result column="min_version" property="minVersion" jdbcType="INTEGER"/>
        <result column="remarks" property="remarks" jdbcType="VARCHAR"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
    id, app_id, name, key, value, min_version, remarks, create_time, update_time
  </sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
    select
    <include refid="Base_Column_List" />
    from app_config
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from app_config
        where id = #{id,jdbcType=BIGINT}
    </select>
    <!-- 非模板 -->
    <sql id="listWhere">
        <if test="query.appId!=null">
            and app_id=#{query.appId}
        </if>
        <if test="query.key!=null">
            and key=#{query.key}
        </if>
        <if test="query.minVersion!=null">
            and min_version=#{query.minVersion}
        </if>
        <if test="query.nameKey!=null">
            and `name` like '${query.nameKey}%'
        </if>
        <if test="query.version!=null">
            and #{query.version}>=min_version
        </if>
        <if test="query.minCreateTime!=null">
            and create_time>=#{query.minCreateTime}
        </if>
        <if test="query.maxCreateTime!=null">
            and #{query.maxCreateTime}>create_time
        </if>
    </sql>
    <select id="list" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from app_config
        where 1=1
        <include refid="listWhere">
        </include>
        <if test="query.sortList!=null">
            <foreach collection="query.sortList" item="item" separator="," open=" order by ">
                #{item}
            </foreach>
        </if>
        limit #{query.start},#{query.count}
    </select>
    <select id="count" resultType="java.lang.Long">
        select
        count(*)
        from app_config
        where 1=1
        <include refid="listWhere">
        </include>
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from app_config
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.AppConfig" >
    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.ks.daylucky.pojo.DO.AppConfig">
    insert into app_config (id, app_id, name, 
      key, value, min_version, 
      remarks, create_time, update_time
@@ -35,98 +99,99 @@
      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.AppConfig" >
    insert into app_config
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        id,
      </if>
      <if test="appId != null" >
        app_id,
      </if>
      <if test="name != null" >
        name,
      </if>
      <if test="key != null" >
        key,
      </if>
      <if test="value != null" >
        value,
      </if>
      <if test="minVersion != null" >
        min_version,
      </if>
      <if test="remarks != null" >
        remarks,
      </if>
      <if test="createTime != null" >
        create_time,
      </if>
      <if test="updateTime != null" >
        update_time,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        #{id,jdbcType=BIGINT},
      </if>
      <if test="appId != null" >
        #{appId,jdbcType=BIGINT},
      </if>
      <if test="name != null" >
        #{name,jdbcType=VARCHAR},
      </if>
      <if test="key != null" >
        #{key,jdbcType=VARCHAR},
      </if>
      <if test="value != null" >
        #{value,jdbcType=VARCHAR},
      </if>
      <if test="minVersion != null" >
        #{minVersion,jdbcType=INTEGER},
      </if>
      <if test="remarks != null" >
        #{remarks,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.AppConfig" >
    update app_config
    <set >
      <if test="appId != null" >
        app_id = #{appId,jdbcType=BIGINT},
      </if>
      <if test="name != null" >
        name = #{name,jdbcType=VARCHAR},
      </if>
      <if test="key != null" >
        key = #{key,jdbcType=VARCHAR},
      </if>
      <if test="value != null" >
        value = #{value,jdbcType=VARCHAR},
      </if>
      <if test="minVersion != null" >
        min_version = #{minVersion,jdbcType=INTEGER},
      </if>
      <if test="remarks != null" >
        remarks = #{remarks,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.AppConfig" >
    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.ks.daylucky.pojo.DO.AppConfig">
        insert into app_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">
                id,
            </if>
            <if test="appId != null">
                app_id,
            </if>
            <if test="name != null">
                name,
            </if>
            <if test="key != null">
                key,
            </if>
            <if test="value != null">
                value,
            </if>
            <if test="minVersion != null">
                min_version,
            </if>
            <if test="remarks != null">
                remarks,
            </if>
            <if test="createTime != null">
                create_time,
            </if>
            <if test="updateTime != null">
                update_time,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">
                #{id,jdbcType=BIGINT},
            </if>
            <if test="appId != null">
                #{appId,jdbcType=BIGINT},
            </if>
            <if test="name != null">
                #{name,jdbcType=VARCHAR},
            </if>
            <if test="key != null">
                #{key,jdbcType=VARCHAR},
            </if>
            <if test="value != null">
                #{value,jdbcType=VARCHAR},
            </if>
            <if test="minVersion != null">
                #{minVersion,jdbcType=INTEGER},
            </if>
            <if test="remarks != null">
                #{remarks,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.AppConfig">
        update app_config
        <set>
            <if test="appId != null">
                app_id = #{appId,jdbcType=BIGINT},
            </if>
            <if test="name != null">
                name = #{name,jdbcType=VARCHAR},
            </if>
            <if test="key != null">
                key = #{key,jdbcType=VARCHAR},
            </if>
            <if test="value != null">
                value = #{value,jdbcType=VARCHAR},
            </if>
            <if test="minVersion != null">
                min_version = #{minVersion,jdbcType=INTEGER},
            </if>
            <if test="remarks != null">
                remarks = #{remarks,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.AppConfig">
    update app_config
    set app_id = #{appId,jdbcType=BIGINT},
      name = #{name,jdbcType=VARCHAR},
service-daylucky/src/main/resources/mapper/MsgTypeConfigMapper.xml
@@ -1,29 +1,82 @@
<?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.ks.daylucky.mapper.MsgTypeConfigMapper" >
  <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.MsgTypeConfig" >
    <id column="id" property="id" jdbcType="BIGINT" />
    <result column="app_id" property="appId" jdbcType="BIGINT" />
    <result column="msg_type" property="msgType" jdbcType="VARCHAR" />
    <result column="msg_name" property="msgName" jdbcType="VARCHAR" />
    <result column="msg_icon" property="msgIcon" jdbcType="VARCHAR" />
    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
  </resultMap>
  <sql id="Base_Column_List" >
<mapper namespace="com.ks.daylucky.mapper.MsgTypeConfigMapper">
    <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.MsgTypeConfig">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="app_id" property="appId" jdbcType="BIGINT"/>
        <result column="msg_type" property="msgType" jdbcType="VARCHAR"/>
        <result column="msg_name" property="msgName" jdbcType="VARCHAR"/>
        <result column="msg_icon" property="msgIcon" jdbcType="VARCHAR"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
    id, app_id, msg_type, msg_name, msg_icon, create_time, update_time
  </sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
    select
    <include refid="Base_Column_List" />
    from msg_type_config
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from msg_type_config
        where id = #{id,jdbcType=BIGINT}
    </select>
    <!-- 非模板 -->
    <sql id="listWhere">
        <if test="query.appId!=null">
            and app_id=#{query.appId}
        </if>
        <if test="query.msgType!=null">
            and msg_type=#{query.msgType}
        </if>
        <if test="query.minCreateTime!=null">
            and create_time>=#{query.minCreateTime}
        </if>
        <if test="query.maxCreateTime!=null">
            and #{query.maxCreateTime}>create_time
        </if>
    </sql>
    <select id="list" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from msg_type_config
        where 1=1
        <include refid="listWhere">
        </include>
        <if test="query.sortList!=null">
            <foreach collection="query.sortList" item="item" separator="," open=" order by ">
                #{item}
            </foreach>
        </if>
        limit #{query.start},#{query.count}
    </select>
    <select id="count" resultType="java.lang.Long">
        select
        count(*)
        from msg_type_config
        where 1=1
        <include refid="listWhere">
        </include>
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from msg_type_config
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig" >
    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig">
    insert into msg_type_config (id, app_id, msg_type, 
      msg_name, msg_icon, create_time, 
      update_time)
@@ -31,80 +84,81 @@
      #{msgName,jdbcType=VARCHAR}, #{msgIcon,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
      #{updateTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig" >
    insert into msg_type_config
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        id,
      </if>
      <if test="appId != null" >
        app_id,
      </if>
      <if test="msgType != null" >
        msg_type,
      </if>
      <if test="msgName != null" >
        msg_name,
      </if>
      <if test="msgIcon != null" >
        msg_icon,
      </if>
      <if test="createTime != null" >
        create_time,
      </if>
      <if test="updateTime != null" >
        update_time,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        #{id,jdbcType=BIGINT},
      </if>
      <if test="appId != null" >
        #{appId,jdbcType=BIGINT},
      </if>
      <if test="msgType != null" >
        #{msgType,jdbcType=VARCHAR},
      </if>
      <if test="msgName != null" >
        #{msgName,jdbcType=VARCHAR},
      </if>
      <if test="msgIcon != null" >
        #{msgIcon,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig" >
    update msg_type_config
    <set >
      <if test="appId != null" >
        app_id = #{appId,jdbcType=BIGINT},
      </if>
      <if test="msgType != null" >
        msg_type = #{msgType,jdbcType=VARCHAR},
      </if>
      <if test="msgName != null" >
        msg_name = #{msgName,jdbcType=VARCHAR},
      </if>
      <if test="msgIcon != null" >
        msg_icon = #{msgIcon,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig" >
    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig">
        insert into msg_type_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">
                id,
            </if>
            <if test="appId != null">
                app_id,
            </if>
            <if test="msgType != null">
                msg_type,
            </if>
            <if test="msgName != null">
                msg_name,
            </if>
            <if test="msgIcon != null">
                msg_icon,
            </if>
            <if test="createTime != null">
                create_time,
            </if>
            <if test="updateTime != null">
                update_time,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">
                #{id,jdbcType=BIGINT},
            </if>
            <if test="appId != null">
                #{appId,jdbcType=BIGINT},
            </if>
            <if test="msgType != null">
                #{msgType,jdbcType=VARCHAR},
            </if>
            <if test="msgName != null">
                #{msgName,jdbcType=VARCHAR},
            </if>
            <if test="msgIcon != null">
                #{msgIcon,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig">
        update msg_type_config
        <set>
            <if test="appId != null">
                app_id = #{appId,jdbcType=BIGINT},
            </if>
            <if test="msgType != null">
                msg_type = #{msgType,jdbcType=VARCHAR},
            </if>
            <if test="msgName != null">
                msg_name = #{msgName,jdbcType=VARCHAR},
            </if>
            <if test="msgIcon != null">
                msg_icon = #{msgIcon,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.MsgTypeConfig">
    update msg_type_config
    set app_id = #{appId,jdbcType=BIGINT},
      msg_type = #{msgType,jdbcType=VARCHAR},
service-daylucky/src/main/resources/mapper/UserInfoExtraMapper.xml
@@ -1,88 +1,98 @@
<?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.ks.daylucky.mapper.UserInfoExtraMapper" >
  <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.UserInfoExtra" >
    <id column="uid" property="uid" jdbcType="BIGINT" />
    <result column="msg_setting" property="msgSetting" jdbcType="VARCHAR" />
    <result column="msg_unread_count" property="msgUnreadCount" jdbcType="INTEGER" />
    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
  </resultMap>
  <sql id="Base_Column_List" >
<mapper namespace="com.ks.daylucky.mapper.UserInfoExtraMapper">
    <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.UserInfoExtra">
        <id column="uid" property="uid" jdbcType="BIGINT"/>
        <result column="msg_setting" property="msgSetting" jdbcType="VARCHAR"/>
        <result column="msg_unread_count" property="msgUnreadCount" jdbcType="INTEGER"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
    uid, msg_setting, msg_unread_count, create_time, update_time
  </sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
    select
    <include refid="Base_Column_List" />
    from user_info_extra
    where uid = #{uid,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from user_info_extra
        where uid = #{0}
    </select>
    <select id="selectByPrimaryKeyForUpdate" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from user_info_extra
        where uid = #{0} for update
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from user_info_extra
    where uid = #{uid,jdbcType=BIGINT}
    where uid = #{0}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra" >
    <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra">
    insert into user_info_extra (uid, msg_setting, msg_unread_count, 
      create_time, update_time)
    values (#{uid,jdbcType=BIGINT}, #{msgSetting,jdbcType=VARCHAR}, #{msgUnreadCount,jdbcType=INTEGER}, 
      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra" >
    insert into user_info_extra
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="uid != null" >
        uid,
      </if>
      <if test="msgSetting != null" >
        msg_setting,
      </if>
      <if test="msgUnreadCount != null" >
        msg_unread_count,
      </if>
      <if test="createTime != null" >
        create_time,
      </if>
      <if test="updateTime != null" >
        update_time,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
      <if test="uid != null" >
        #{uid,jdbcType=BIGINT},
      </if>
      <if test="msgSetting != null" >
        #{msgSetting,jdbcType=VARCHAR},
      </if>
      <if test="msgUnreadCount != null" >
        #{msgUnreadCount,jdbcType=INTEGER},
      </if>
      <if test="createTime != null" >
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra" >
    update user_info_extra
    <set >
      <if test="msgSetting != null" >
        msg_setting = #{msgSetting,jdbcType=VARCHAR},
      </if>
      <if test="msgUnreadCount != null" >
        msg_unread_count = #{msgUnreadCount,jdbcType=INTEGER},
      </if>
      <if test="createTime != null" >
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </set>
    where uid = #{uid,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra" >
    <insert id="insertSelective"
            parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra">
        insert into user_info_extra
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="uid != null">
                uid,
            </if>
            <if test="msgSetting != null">
                msg_setting,
            </if>
            <if test="msgUnreadCount != null">
                msg_unread_count,
            </if>
            <if test="createTime != null">
                create_time,
            </if>
            <if test="updateTime != null">
                update_time,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="uid != null">
                #{uid,jdbcType=BIGINT},
            </if>
            <if test="msgSetting != null">
                #{msgSetting,jdbcType=VARCHAR},
            </if>
            <if test="msgUnreadCount != null">
                #{msgUnreadCount,jdbcType=INTEGER},
            </if>
            <if test="createTime != null">
                #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra">
        update user_info_extra
        <set>
            <if test="msgSetting != null">
                msg_setting = #{msgSetting,jdbcType=VARCHAR},
            </if>
            <if test="msgUnreadCount != null">
                msg_unread_count = #{msgUnreadCount,jdbcType=INTEGER},
            </if>
            <if test="createTime != null">
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </set>
        where uid = #{uid,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.UserInfoExtra">
    update user_info_extra
    set msg_setting = #{msgSetting,jdbcType=VARCHAR},
      msg_unread_count = #{msgUnreadCount,jdbcType=INTEGER},
service-daylucky/src/main/resources/mapper/UserInfoMapper.xml
@@ -1,36 +1,110 @@
<?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.ks.daylucky.mapper.UserInfoMapper" >
  <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.UserInfo" >
    <id column="id" property="id" jdbcType="BIGINT" />
    <result column="app_id" property="appId" jdbcType="BIGINT" />
    <result column="identify_code" property="identifyCode" jdbcType="VARCHAR" />
    <result column="nick_name" property="nickName" jdbcType="VARCHAR" />
    <result column="portrait" property="portrait" jdbcType="VARCHAR" />
    <result column="mobile" property="mobile" jdbcType="VARCHAR" />
    <result column="alipay_uid" property="alipayUid" jdbcType="VARCHAR" />
    <result column="alipay_portrait" property="alipayPortrait" jdbcType="VARCHAR" />
    <result column="wx_open_id" property="wxOpenId" jdbcType="VARCHAR" />
    <result column="wx_union_id" property="wxUnionId" jdbcType="VARCHAR" />
    <result column="wx_portrait" property="wxPortrait" jdbcType="VARCHAR" />
    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
  </resultMap>
  <sql id="Base_Column_List" >
<mapper namespace="com.ks.daylucky.mapper.UserInfoMapper">
    <resultMap id="BaseResultMap" type="com.ks.daylucky.pojo.DO.UserInfo">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="app_id" property="appId" jdbcType="BIGINT"/>
        <result column="identify_code" property="identifyCode" jdbcType="VARCHAR"/>
        <result column="nick_name" property="nickName" jdbcType="VARCHAR"/>
        <result column="portrait" property="portrait" jdbcType="VARCHAR"/>
        <result column="mobile" property="mobile" jdbcType="VARCHAR"/>
        <result column="alipay_uid" property="alipayUid" jdbcType="VARCHAR"/>
        <result column="alipay_portrait" property="alipayPortrait" jdbcType="VARCHAR"/>
        <result column="wx_open_id" property="wxOpenId" jdbcType="VARCHAR"/>
        <result column="wx_union_id" property="wxUnionId" jdbcType="VARCHAR"/>
        <result column="wx_portrait" property="wxPortrait" jdbcType="VARCHAR"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
    id, app_id, identify_code, nick_name, portrait, mobile, alipay_uid, alipay_portrait, 
    wx_open_id, wx_union_id, wx_portrait, create_time, update_time
  </sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
    select
    <include refid="Base_Column_List" />
    from user_info
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List"/>
        from user_info
        where id = #{id,jdbcType=BIGINT}
    </select>
    <!-- 非模板 -->
    <sql id="listWhere">
        <if test="query.appId!=null">
            and app_id=#{query.appId}
        </if>
        <if test="query.identifyCode!=null">
            and identify_code=#{query.identifyCode}
        </if>
        <if test="query.key!=null">
            and nick_name like '${query.key}%'
        </if>
        <if test="query.mobile!=null">
            and mobile=#{query.mobile}
        </if>
        <if test="query.alipayUid!=null">
            and alipay_uid=#{query.alipayUid}
        </if>
        <if test="query.wxOpenId!=null">
            and wx_open_id=#{query.wxOpenId}
        </if>
        <if test="query.wxUnionId!=null">
            and wx_union_id=#{query.wxUnionId}
        </if>
        <if test="query.minCreateTime!=null">
            and create_time>=#{query.minCreateTime}
        </if>
        <if test="query.maxCreateTime!=null">
            and #{query.maxCreateTime}>create_time
        </if>
    </sql>
    <select id="list" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from user_info
        where 1=1
        <include refid="listWhere">
        </include>
        <if test="query.sortList!=null">
            <foreach collection="query.sortList" item="item" separator="," open=" order by ">
                #{item}
            </foreach>
        </if>
        limit #{query.start},#{query.count}
    </select>
    <select id="count" resultType="java.lang.Long">
        select
        count(*)
        from user_info
        where 1=1
        <include refid="listWhere">
        </include>
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from user_info
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.UserInfo" >
    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.ks.daylucky.pojo.DO.UserInfo">
    insert into user_info (id, app_id, identify_code, 
      nick_name, portrait, mobile, 
      alipay_uid, alipay_portrait, wx_open_id, 
@@ -42,134 +116,135 @@
      #{wxUnionId,jdbcType=VARCHAR}, #{wxPortrait,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
      #{updateTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.UserInfo" >
    insert into user_info
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        id,
      </if>
      <if test="appId != null" >
        app_id,
      </if>
      <if test="identifyCode != null" >
        identify_code,
      </if>
      <if test="nickName != null" >
        nick_name,
      </if>
      <if test="portrait != null" >
        portrait,
      </if>
      <if test="mobile != null" >
        mobile,
      </if>
      <if test="alipayUid != null" >
        alipay_uid,
      </if>
      <if test="alipayPortrait != null" >
        alipay_portrait,
      </if>
      <if test="wxOpenId != null" >
        wx_open_id,
      </if>
      <if test="wxUnionId != null" >
        wx_union_id,
      </if>
      <if test="wxPortrait != null" >
        wx_portrait,
      </if>
      <if test="createTime != null" >
        create_time,
      </if>
      <if test="updateTime != null" >
        update_time,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
      <if test="id != null" >
        #{id,jdbcType=BIGINT},
      </if>
      <if test="appId != null" >
        #{appId,jdbcType=BIGINT},
      </if>
      <if test="identifyCode != null" >
        #{identifyCode,jdbcType=VARCHAR},
      </if>
      <if test="nickName != null" >
        #{nickName,jdbcType=VARCHAR},
      </if>
      <if test="portrait != null" >
        #{portrait,jdbcType=VARCHAR},
      </if>
      <if test="mobile != null" >
        #{mobile,jdbcType=VARCHAR},
      </if>
      <if test="alipayUid != null" >
        #{alipayUid,jdbcType=VARCHAR},
      </if>
      <if test="alipayPortrait != null" >
        #{alipayPortrait,jdbcType=VARCHAR},
      </if>
      <if test="wxOpenId != null" >
        #{wxOpenId,jdbcType=VARCHAR},
      </if>
      <if test="wxUnionId != null" >
        #{wxUnionId,jdbcType=VARCHAR},
      </if>
      <if test="wxPortrait != null" >
        #{wxPortrait,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.UserInfo" >
    update user_info
    <set >
      <if test="appId != null" >
        app_id = #{appId,jdbcType=BIGINT},
      </if>
      <if test="identifyCode != null" >
        identify_code = #{identifyCode,jdbcType=VARCHAR},
      </if>
      <if test="nickName != null" >
        nick_name = #{nickName,jdbcType=VARCHAR},
      </if>
      <if test="portrait != null" >
        portrait = #{portrait,jdbcType=VARCHAR},
      </if>
      <if test="mobile != null" >
        mobile = #{mobile,jdbcType=VARCHAR},
      </if>
      <if test="alipayUid != null" >
        alipay_uid = #{alipayUid,jdbcType=VARCHAR},
      </if>
      <if test="alipayPortrait != null" >
        alipay_portrait = #{alipayPortrait,jdbcType=VARCHAR},
      </if>
      <if test="wxOpenId != null" >
        wx_open_id = #{wxOpenId,jdbcType=VARCHAR},
      </if>
      <if test="wxUnionId != null" >
        wx_union_id = #{wxUnionId,jdbcType=VARCHAR},
      </if>
      <if test="wxPortrait != null" >
        wx_portrait = #{wxPortrait,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null" >
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateTime != null" >
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.UserInfo" >
    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.ks.daylucky.pojo.DO.UserInfo">
        insert into user_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">
                id,
            </if>
            <if test="appId != null">
                app_id,
            </if>
            <if test="identifyCode != null">
                identify_code,
            </if>
            <if test="nickName != null">
                nick_name,
            </if>
            <if test="portrait != null">
                portrait,
            </if>
            <if test="mobile != null">
                mobile,
            </if>
            <if test="alipayUid != null">
                alipay_uid,
            </if>
            <if test="alipayPortrait != null">
                alipay_portrait,
            </if>
            <if test="wxOpenId != null">
                wx_open_id,
            </if>
            <if test="wxUnionId != null">
                wx_union_id,
            </if>
            <if test="wxPortrait != null">
                wx_portrait,
            </if>
            <if test="createTime != null">
                create_time,
            </if>
            <if test="updateTime != null">
                update_time,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">
                #{id,jdbcType=BIGINT},
            </if>
            <if test="appId != null">
                #{appId,jdbcType=BIGINT},
            </if>
            <if test="identifyCode != null">
                #{identifyCode,jdbcType=VARCHAR},
            </if>
            <if test="nickName != null">
                #{nickName,jdbcType=VARCHAR},
            </if>
            <if test="portrait != null">
                #{portrait,jdbcType=VARCHAR},
            </if>
            <if test="mobile != null">
                #{mobile,jdbcType=VARCHAR},
            </if>
            <if test="alipayUid != null">
                #{alipayUid,jdbcType=VARCHAR},
            </if>
            <if test="alipayPortrait != null">
                #{alipayPortrait,jdbcType=VARCHAR},
            </if>
            <if test="wxOpenId != null">
                #{wxOpenId,jdbcType=VARCHAR},
            </if>
            <if test="wxUnionId != null">
                #{wxUnionId,jdbcType=VARCHAR},
            </if>
            <if test="wxPortrait != null">
                #{wxPortrait,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.ks.daylucky.pojo.DO.UserInfo">
        update user_info
        <set>
            <if test="appId != null">
                app_id = #{appId,jdbcType=BIGINT},
            </if>
            <if test="identifyCode != null">
                identify_code = #{identifyCode,jdbcType=VARCHAR},
            </if>
            <if test="nickName != null">
                nick_name = #{nickName,jdbcType=VARCHAR},
            </if>
            <if test="portrait != null">
                portrait = #{portrait,jdbcType=VARCHAR},
            </if>
            <if test="mobile != null">
                mobile = #{mobile,jdbcType=VARCHAR},
            </if>
            <if test="alipayUid != null">
                alipay_uid = #{alipayUid,jdbcType=VARCHAR},
            </if>
            <if test="alipayPortrait != null">
                alipay_portrait = #{alipayPortrait,jdbcType=VARCHAR},
            </if>
            <if test="wxOpenId != null">
                wx_open_id = #{wxOpenId,jdbcType=VARCHAR},
            </if>
            <if test="wxUnionId != null">
                wx_union_id = #{wxUnionId,jdbcType=VARCHAR},
            </if>
            <if test="wxPortrait != null">
                wx_portrait = #{wxPortrait,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null">
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateTime != null">
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.ks.daylucky.pojo.DO.UserInfo">
    update user_info
    set app_id = #{appId,jdbcType=BIGINT},
      identify_code = #{identifyCode,jdbcType=VARCHAR},
service-daylucky/src/main/resources/mapper/UserMsgMapper.xml
@@ -18,11 +18,66 @@
    from user_msg
    where id = #{id,jdbcType=BIGINT}
  </select>
  <!-- 非模板 -->
  <sql id="listWhere">
    <if test="query.uid!=null">
      and uid=#{query.uid}
    </if>
    <if test="query.msgType!=null">
      and msg_type=#{query.msgType}
    </if>
    <if test="query.minCreateTime!=null">
      and create_time>=#{query.minCreateTime}
    </if>
    <if test="query.maxCreateTime!=null">
      and #{query.maxCreateTime}>create_time
    </if>
  </sql>
  <select id="list" resultMap="BaseResultMap">
    select
    <include refid="Base_Column_List"/>
    from user_msg
    where 1=1
    <include refid="listWhere">
    </include>
    <if test="query.sortList!=null">
      <foreach collection="query.sortList" item="item" separator="," open=" order by ">
        #{item}
      </foreach>
    </if>
    limit #{query.start},#{query.count}
  </select>
  <select id="count" resultType="java.lang.Long">
    select
    count(*)
    from user_msg
    where 1=1
    <include refid="listWhere">
    </include>
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
    delete from user_msg
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.ks.daylucky.pojo.DO.UserMsg" >
  <insert id="insert"  useGeneratedKeys="true" keyProperty="id" parameterType="com.ks.daylucky.pojo.DO.UserMsg" >
    insert into user_msg (id, uid, msg_type, 
      msg_content, create_time, update_time
      )
@@ -30,7 +85,7 @@
      #{msgContent,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.ks.daylucky.pojo.DO.UserMsg" >
  <insert id="insertSelective"  useGeneratedKeys="true" keyProperty="id" parameterType="com.ks.daylucky.pojo.DO.UserMsg" >
    insert into user_msg
    <trim prefix="(" suffix=")" suffixOverrides="," >
      <if test="id != null" >
service-lucky/src/main/java/com/ks/lucky/util/mq/consume/AcitivtyConsumer.java
File was deleted