From 40a8ed9460cee62d601f7bd6aced36a9ff92b289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 28 Jul 2025 11:19:37 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/StoreMessageDAO.java | 7 +++++-- .../cool/store/mapper/StoreMessageMapper.java | 4 +++- .../resources/mapper/StoreMessageMapper.xml | 20 ++++++++++++------- .../com/cool/store/entity/StoreMessageDO.java | 2 +- .../cool/store/vo/notice/MessageDetailVO.java | 2 ++ .../store/service/MessageTemplateService.java | 2 +- .../impl/MessageTemplateServiceImpl.java | 13 ++++++++++-- .../webc/MiniMessageTemplateController.java | 2 +- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreMessageDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreMessageDAO.java index 7f3e25032..888cec788 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreMessageDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreMessageDAO.java @@ -73,8 +73,11 @@ public class StoreMessageDAO { return storeMessageMapper.revokeById(id,userId,userName); } - public Integer queryStoreModuleCount(String storeId, Integer moduleCode){ - return storeMessageMapper.queryStoreModuleCount(storeId,moduleCode); + public Integer queryStoreModuleCount(String storeId,String userId, Integer moduleCode){ + if (storeId == null|| userId == null){ + return 0; + } + return storeMessageMapper.queryStoreModuleCount(storeId,userId,moduleCode); } public List getStoreMessageListByCondition(String storeId, Integer moduleCode, Integer todayTask, Integer pendingFlag, String userId){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java index 475ad3519..54a01ecf9 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMessageMapper.java @@ -23,7 +23,9 @@ public interface StoreMessageMapper extends Mapper { int revokeById(@Param("id") Long id, @Param("userId") String userId, @Param("userName") String userName); - Integer queryStoreModuleCount(@Param("storeId") String storeId, @Param("moduleCode") Integer moduleCode); + Integer queryStoreModuleCount(@Param("storeId") String storeId, + @Param("userId") String userId, + @Param("moduleCode") Integer moduleCode); List getStoreMessageListByCondition(@Param("storeId") String storeId, @Param("moduleCode") Integer moduleCode, diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml index 14d725d0a..e5ae6486f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml @@ -146,7 +146,8 @@ select count(1) from zxjp_store_message a left join zxjp_message_template b on a.message_template_id = b.id where a.store_id = #{storeId} - and b.module_id = #{moduleCode} + and b.module_code = #{moduleCode} + and a.operator_list like concat('%',#{userId},'%') limit 1 @@ -169,15 +170,19 @@ and a.store_id = #{storeId} - and b.module_id = #{moduleCode} + and b.module_code = #{moduleCode} and b.today_task = #{todayTask} - and a.process_status = #{pendingFlag} + and a.process_status = 0 and (b.remind_type = 1 or (b.remind_type = 2 and NOW() BETWEEN b.remind_start_time AND b.remind_end_time )) + + and a.operator_list like concat('%',#{userId},'%') + + and revoke_status = 0 @@ -186,13 +191,14 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java index 99faf5ac9..5a70e2823 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreMessageDO.java @@ -79,7 +79,7 @@ public class StoreMessageDO { * 撤销状态(0:未撤销 1:已撤销) */ @Column(name = "revoke_status") - private Boolean revokeStatus; + private Integer revokeStatus; /** * 撤销时间 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageDetailVO.java index 5c94b1610..d5e715e59 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageDetailVO.java @@ -30,4 +30,6 @@ public class MessageDetailVO { @ApiModelProperty("发布人") private String publishUserName; + private String publishUserId; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java index 7018f5bbc..190a7ea30 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java @@ -84,7 +84,7 @@ public interface MessageTemplateService { */ Boolean revokeById(Long id, LoginUserInfo user); - List getModuleList(String storeId); + List getModuleList(String storeId,PartnerUserInfoVO userInfoVO); PageInfo getStorePendingList(StoreMessagePendingRequest request); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 26d2b4bc9..69b01007b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -274,11 +274,16 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } @Override - public List getModuleList(String storeId) { + public List getModuleList(String storeId,PartnerUserInfoVO userInfoVO) { List moduleAndMatterList = ModuleAndMatterVO.getModuleAndMatterList(); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile("18375320931"); + if (enterpriseUserDO == null){ + enterpriseUserDO = new EnterpriseUserDO(); + } List list= new ArrayList<>(); + EnterpriseUserDO finalEnterpriseUserDO = enterpriseUserDO; moduleAndMatterList.forEach(x->{ - Integer integer = storeMessageDAO.queryStoreModuleCount(storeId, x.getModuleCode()); + Integer integer = storeMessageDAO.queryStoreModuleCount(storeId, finalEnterpriseUserDO.getUserId(), x.getModuleCode()); if (integer > 0){ list.add(x); } @@ -298,6 +303,10 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { @Override public MessageDetailVO getMessageDetail(Long id) { MessageDetailVO messageDetailVO = storeMessageDAO.getMessageDetail(id); + if (messageDetailVO!=null&&messageDetailVO.getPublishUserId()!=null){ + EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(messageDetailVO.getPublishUserId()); + messageDetailVO.setPublishUserName(userInfoById.getName()); + } return messageDetailVO; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java index 6139d371e..b3ffcf5d3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java @@ -34,7 +34,7 @@ public class MiniMessageTemplateController { @ApiOperation("获取每个门店需要展示的模块") @GetMapping("/getModuleListByStoreId") public ResponseResult> getModuleListByStoreId(@RequestParam("id")String storeId) { - return ResponseResult.success(messageTemplateService.getModuleList(storeId)); + return ResponseResult.success(messageTemplateService.getModuleList(storeId, PartnerUserHolder.getUser())); } @ApiOperation("获取消息详情")