From ceadca6dad0e54061b39ebd6e342edcd058d14e9 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Thu, 5 Aug 2021 08:46:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/bizmessage/dao/mapper/BizMessageMapper.xml     | 8 ++++----
 .../mall/ebtp/extend/bizmessage/entity/BizMessage.java    | 1 +
 .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java  | 1 +
 .../service/impl/BizMessageConsumerServiceImpl.java       | 1 +
 .../service/impl/BizMessageProducerServiceImpl.java       | 1 +
 .../mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java | 1 +
 6 files changed, 9 insertions(+), 4 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 cf3de85..a83dc75 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
@@ -19,16 +19,16 @@
     </select>
 
     <select id="findMessageVo" resultType="com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo">
-        SELECT biz_message.*,'1' as authorizestate
+        SELECT biz_message.*,biz_message_template.type as templatetype,'1' as authorizestate
         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.*,IFNULL(b.state,1) as authorizestate
-            FROM ( SELECT biz_message.*
+            FROM ( SELECT biz_message.*,biz_message_template.type as 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
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 d3d6df1..102ee6e 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
@@ -18,6 +18,7 @@ public class BizMessage {
     private String params;
     private Timestamp createtime;
     private String servicecode;
+    private String templatecode;
 
     /* 该值为1则标识开启授权控制，只有授权列表( biz_message_authorize )内的用户可见 */
     private Integer authorize;
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
index 67441fb..03a92a2 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
@@ -6,5 +6,6 @@ import lombok.Data;
 public class BizMessageVo extends BizMessage{
 
     private String authorizestate;
+    private String templatetype;
 
 }
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 1d06804..0d1ca82 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
@@ -52,6 +52,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
             vo.setMsgId(source.getId());
             vo.setServicecode(source.getServicecode());
             vo.setAuthorizestate(source.getAuthorizestate());
+            vo.setTemplatetype(source.getTemplatetype());
             BeanUtils.copyProperties(source, vo);
             return vo;
         }).collect(Collectors.toList()));
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 996f4f0..89226a0 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
@@ -86,6 +86,7 @@ public class BizMessageProducerServiceImpl implements BizMessageProducerService
         bizmessage.setUrl(fill(dao.getRouter(), messageRaw.getExtra()));
         bizmessage.setParams(toJson(messageRaw.getExtra()));
         bizmessage.setServicecode(toJson(messageRaw.getServicecode()));
+        bizmessage.setTemplatecode(dao.getCode());
 
         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 0d6a1b5..7fe5699 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
@@ -18,6 +18,7 @@ public class DescribeSiteMsgVO {
     private String category;
     private String servicecode;
     private String authorizestate;
+    private String templatetype;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp createtime;