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] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=BE=84=E6=B8=85?= =?UTF-8?q?=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; + } }