From 2318de6deb0c21860ae34ea84974706847747335 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Wed, 4 Aug 2021 11:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 7 +++++--
 .../mall/ebtp/extend/bizmessage/entity/BizMessage.java     | 1 +
 .../service/impl/BizMessageConsumerServiceImpl.java        | 1 +
 .../service/impl/BizMessageProducerServiceImpl.java        | 2 +-
 .../mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java  | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
index 40fec46..3f78773 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
@@ -3,15 +3,18 @@
 <mapper namespace="com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper">
 
     <select id="findMessage" resultType="com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage">
-        SELECT *
+        SELECT *,biz_message_template.type as templatetype
         FROM biz_message
+        left join biz_message_template on biz_message.templatecode = biz_message_template.code
         WHERE authorize = 0
 
         <if test="userId!=null and userId!=''">
             UNION ALL
 
             SELECT a.*
-            FROM ( SELECT * FROM biz_message WHERE authorize = 1) a
+            FROM ( SELECT *,biz_message_template.type templatetype FROM biz_message
+            left join biz_message_template on biz_message.templatecode = biz_message_template.code
+             WHERE authorize = 1) a
             INNER JOIN
             ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id
         </if>
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java
index 4b598a5..c8f65c1 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java
@@ -16,6 +16,7 @@ public class BizMessage {
     private String url;
     private String params;
     private Timestamp createtime;
+    private String templatecode;
     private String templatetype;
 
     /* 该值为1则标识开启授权控制，只有授权列表( biz_message_authorize )内的用户可见 */
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
index 46bf4b8..5c52e7f 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
@@ -48,6 +48,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
         result.setRecords(pageEntity.getRecords().stream().map(source -> {
             DescribeSiteMsgVO vo = new DescribeSiteMsgVO();
             vo.setMsgId(source.getId());
+            vo.setTemplatetype(source.getTemplatetype());
             BeanUtils.copyProperties(source, vo);
 
             return vo;
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java
index e6ecc2b..9765b2a 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java
@@ -85,7 +85,7 @@ public class BizMessageProducerServiceImpl implements BizMessageProducerService
         bizmessage.setContent(fill(dao.getBody(), messageRaw.getBody()));
         bizmessage.setUrl(fill(dao.getRouter(), messageRaw.getExtra()));
         bizmessage.setParams(toJson(messageRaw.getExtra()));
-        bizmessage.setTemplatetype(dao.getType());
+        bizmessage.setTemplatecode(messageRaw.getTemplateCode());
 
         Optional.ofNullable(messageRaw.getUsers()).ifPresent(users -> {
             log.debug("if user list {} is not emtpy, then grant current message to them.", users);
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java
index 913c68b..d62e3b1 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java
@@ -16,6 +16,7 @@ public class DescribeSiteMsgVO {
     private String msgId;
     private String title;
     private String category;
+    private String templatetype;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp createtime;