From 960080380eccca15e1b60d17dd77e1c4358b29ab Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 09:12:12 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +-- .../BizMessageConsumerController.java | 15 +++++++++ .../bizmessage/dao/BizMessageMapper.java | 6 ++-- .../dao/mapper/BizMessageMapper.xml | 30 +++++++++++++++++ .../extend/bizmessage/entity/CompanyObj.java | 10 ++++++ .../extend/bizmessage/entity/Message.java | 15 +++++++++ .../entity/SupplierMsgReadInVo.java | 14 ++++++++ .../entity/SupplierMsgReadOutVo.java | 11 +++++++ .../service/BizMessageConsumerService.java | 11 +++++-- .../impl/BizMessageConsumerServiceImpl.java | 32 +++++++++++++++---- 10 files changed, 134 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java diff --git a/pom.xml b/pom.xml index 97225f0..9913f9b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.0-SNAPSHOT + 2.3.1-SNAPSHOT com.chinaunicom.mall.ebtp @@ -20,7 +20,7 @@ com.chinaunicom.mall.ebtp uboot-core - 2.3.0-SNAPSHOT + 2.3.1-SNAPSHOT diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 86ec5fa..3f64102 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.SupplierMsgReadInVo; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.SupplierMsgReadOutVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO; @@ -94,4 +96,17 @@ public class BizMessageConsumerController { this.service.updateState(id); return true; } + + /** + * 供应商澄清待办 + * + * @return + */ + @ApiOperation("供应商澄清待办") + @PostMapping("supplierClearMsgRead") + @ResponseStatus(code = HttpStatus.OK) + public SupplierMsgReadOutVo supplierClearMsgRead(@RequestBody SupplierMsgReadInVo msgReadInVo) { + SupplierMsgReadOutVo outVo = this.service.supplierClearMsgRead(msgReadInVo); + return outVo; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index d77c221..4a2437e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -3,9 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.*; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +28,6 @@ public interface BizMessageMapper extends BaseMapper { Integer deleteMessageById(@Param("magId")String magId); Integer deleteAuthorizeById(@Param("magId")String magId,@Param("userId")String userId); + + List supplierClearMsgRead(@Param("vo") SupplierMsgReadInVo msgReadInVo); } 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 71998c3..715ade2 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 @@ -136,4 +136,34 @@ and user_id = #{userId} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java new file mode 100644 index 0000000..d832753 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/CompanyObj.java @@ -0,0 +1,10 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +@Data +public class CompanyObj { + + private String companyId; + private String userId; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java new file mode 100644 index 0000000..8bc35e6 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java @@ -0,0 +1,15 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +@Data +public class Message { + + private String id; + private String companyId; + private String userId; + private String type; + private String title; + private String createTime; + private String content; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java new file mode 100644 index 0000000..51e8eac --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadInVo.java @@ -0,0 +1,14 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class SupplierMsgReadInVo { + + private List companyObjs; + private String state; + private String startTime; + private String endTime; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java new file mode 100644 index 0000000..2239768 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/SupplierMsgReadOutVo.java @@ -0,0 +1,11 @@ +package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class SupplierMsgReadOutVo { + + private List messageList; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index 40fab11..17faa3b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -1,9 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; @@ -25,4 +23,11 @@ public interface BizMessageConsumerService { * @return */ BizMessageAuthorize getAuthorize(BizMessageAuthorize authorize); + + /** + * 供应商澄清待办 + * @param msgReadInVo + * @return + */ + SupplierMsgReadOutVo supplierClearMsgRead(SupplierMsgReadInVo msgReadInVo); } 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 0021ae3..24ab5b9 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 @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.BizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; @@ -16,9 +14,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -141,4 +137,28 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService List authorizes = this.mapper.findAuthorizeList(authorize); return authorizes!=null&&authorizes.size()>0?authorizes.get(0):new BizMessageAuthorize(); } + + /** + * 供应商澄清待办 + * @param msgReadInVo + * @return + */ + @Override + public SupplierMsgReadOutVo supplierClearMsgRead(SupplierMsgReadInVo msgReadInVo){ + SupplierMsgReadOutVo vo = new SupplierMsgReadOutVo(); + Map companyMap = new HashMap<>(); + + msgReadInVo.getCompanyObjs().forEach(c->{ + companyMap.put(c.getUserId(),c.getCompanyId()); + }); + + //查询供应商 账号 + List messageList = this.mapper.supplierClearMsgRead(msgReadInVo); + messageList.forEach(m->{ + m.setCompanyId(companyMap.get(m.getUserId())); + }); + + vo.setMessageList(messageList); + return vo; + } } From 4e60f68ea779ed28a8ddc7e5299195fa29ab2add Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 09:24:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 715ade2..e161726 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 @@ -163,7 +163,7 @@ #{companyObj.userId, jdbcType=NUMERIC} - and biz_message.createtime >= #{startTime} - and biz_message.createtime <= #{endTime} + and biz_message.createtime >= #{vo.startTime} + and biz_message.createtime <= #{vo.endTime} \ No newline at end of file From 7b500058d52efcfdc57fcde45c99232f760cc20c Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 09:36:59 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 6 ------ 1 file changed, 6 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 e161726..f55cfd2 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 @@ -157,12 +157,6 @@ AND authorize.state = #{vo.state} - - AND authorize.user_id in - - #{companyObj.userId, jdbcType=NUMERIC} - - and biz_message.createtime >= #{vo.startTime} and biz_message.createtime <= #{vo.endTime} From c4a82c38b70500d5fe3e5e41be28559a6b3f6be1 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 09:37:26 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 f55cfd2..80e7177 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 @@ -148,8 +148,8 @@ biz_message.content AS content FROM biz_message - LEFT JOIN biz_message_template ON biz_message.templatecode = biz_message_template. - CODE INNER JOIN biz_message_authorize authorize ON biz_message.id = authorize.message_id + LEFT JOIN biz_message_template ON biz_message.templatecode = biz_message_template.CODE + INNER JOIN biz_message_authorize authorize ON biz_message.id = authorize.message_id WHERE authorize = 1 AND biz_message.templatecode = 'T0002' From d25ab1445c2d79c9a2f6376bb8254bbcbdfbe560 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 09:45:02 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/bizmessage/dao/mapper/BizMessageMapper.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 80e7177..c7955e5 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 @@ -140,7 +140,7 @@ From 1e30a7b3138ca4fdcbf1a7de499334fc334f4899 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 10:05:53 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 3f64102..16024b0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -1,10 +1,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.SupplierMsgReadInVo; -import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.SupplierMsgReadOutVo; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO; @@ -105,8 +103,8 @@ public class BizMessageConsumerController { @ApiOperation("供应商澄清待办") @PostMapping("supplierClearMsgRead") @ResponseStatus(code = HttpStatus.OK) - public SupplierMsgReadOutVo supplierClearMsgRead(@RequestBody SupplierMsgReadInVo msgReadInVo) { + public BaseResponse> supplierClearMsgRead(@RequestBody SupplierMsgReadInVo msgReadInVo) { SupplierMsgReadOutVo outVo = this.service.supplierClearMsgRead(msgReadInVo); - return outVo; + return BaseResponse.success(outVo.getMessageList()); } } From f316a9eb8ab59f1d45fd090a3837ccfcb2b3d13f Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 6 Dec 2024 10:30:41 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84?= =?UTF-8?q?=E6=B8=85=E4=BF=A1=E6=81=AF=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 1 + .../chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java | 1 + 2 files changed, 2 insertions(+) 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 c7955e5..25252b9 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 @@ -143,6 +143,7 @@ null AS companyId, authorize.user_id AS userId, '0' AS type, + authorize.state as state, biz_message.title AS title, biz_message.createtime AS createTime, biz_message.content AS content diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java index 8bc35e6..6f0a1b3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/Message.java @@ -9,6 +9,7 @@ public class Message { private String companyId; private String userId; private String type; + private String state; private String title; private String createTime; private String content; From 753aa0eeda91b48abd9019cfc663984e5a893117 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 13 Dec 2024 08:58:56 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 223c0db..faa31ac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ # 扩展功能微服务组件 公告通知功能、共享文档... - + pom版本 测试 2.3.1-SNAPSHOT + 生产 2.3.0-SNAPSHOT + gjgs 测试 2.3.0-SNAPSHOT + 生产 2.3.1-gjgs-SNAPSHOT ## 组件模块 1. 消息模块 diff --git a/pom.xml b/pom.xml index 9913f9b..97225f0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.1-SNAPSHOT + 2.3.0-SNAPSHOT com.chinaunicom.mall.ebtp @@ -20,7 +20,7 @@ com.chinaunicom.mall.ebtp uboot-core - 2.3.1-SNAPSHOT + 2.3.0-SNAPSHOT