Merge remote-tracking branch 'origin/master'

sooka-jnb/src/main/java/com/sooka/jnb/my/domain/Announcement.java

@@ -42,6 +42,16 @@ public class Announcement extends BaseEntity {
     /** 消息状态（1：已读；0：未读） */
     private String readType;
 
+    /**
+     * 公告类型
+     */
+    private String annoType;
+
+    /**
+     * 绑定数据id
+     */
+    private String bindId;
+
     public Announcement() {
     }
 

sooka-jnb/src/main/java/com/sooka/jnb/my/service/impl/JnbNameAuthenticationServiceImpl.java

@@ -130,6 +130,8 @@ public class JnbNameAuthenticationServiceImpl implements IJnbNameAuthenticationS
         String type = DictUtils.getDictLabel("examine_state",jnbNameAuthentication.getStatus());
         announcement.setAnnouncementTitle(type+":[实名认证]");
         announcement.setAnnouncementBody("您在"+data+"发起的[实名认证]信息已["+type+"]");
+        announcement.setAnnoType("jnb_name_authentication");
+        announcement.setBindId(jnbNameAuthentication.getId());
         announcementService.insertAnnouncement(announcement);
         if (jnbNameAuthentication.getStatus().equals("1")){
             jnbNameAuthenticationMapper.updateWxUser(jnbNameAuthentication);

sooka-jnb/src/main/java/com/sooka/jnb/my/service/impl/JnbOfficialAuthenticationServiceImpl.java

@@ -134,6 +134,8 @@ public class JnbOfficialAuthenticationServiceImpl implements IJnbOfficialAuthent
         String type = DictUtils.getDictLabel("examine_state",jnbOfficialAuthentication.getStatus());
         announcement.setAnnouncementTitle(type+":[官方认证]");
         announcement.setAnnouncementBody("您在"+data+"发起的[官方认证]信息已["+type+"]");
+        announcement.setAnnoType("jnb_official_authentication");
+        announcement.setBindId(jnbOfficialAuthentication.getId());
         announcementService.insertAnnouncement(announcement);
         return jnbOfficialAuthenticationMapper.updateJnbOfficialAuthentication(jnbOfficialAuthentication);
     }

sooka-jnb/src/main/resources/mapper/my/AnnouncementMapper.xml

@@ -17,10 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="readType" column="read_type"/>
+        <result property="annoType" column="anno_type"/>
+        <result property="bindId" column="bind_id"/>
     </resultMap>
 
     <sql id="selectAnnouncementVo">
-        select id, announcement_title, announcement_body, validity_start_time, validity_end_time, announcement_img, user_id, create_by, create_time, update_by, update_time from jnb_announcement
+        select id, announcement_title, announcement_body, validity_start_time, validity_end_time, announcement_img, user_id, create_by, create_time, update_by, update_time, anno_type, bind_id from jnb_announcement
     </sql>
 
     <sql id="selectList">
@@ -60,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.validity_end_time,
                a.announcement_img,
                a.user_id,
+               a.anno_type,
+               a.bind_id,
                uc.nick_name as create_by,
                a.create_time,
                uu.nick_name as update_by,
@@ -84,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="annoType != null and annoType != ''">anno_type,</if>
+            <if test="bindId != null and bindId != ''">bind_id,</if>
             del_flag,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -98,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="annoType != null and annoType != ''">#{annoType},</if>
+            <if test="bindId != null and bindId != ''">#{bindId},</if>
             1,
          </trim>
     </insert>