From 839d5421ad1bb6d3e869fb8a3c3b41ff9268cb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 31 Jul 2025 10:53:55 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/StoreMessageMapper.xml | 4 +++- .../cool/store/vo/notice/MessageDetailVO.java | 4 ++++ .../store/service/MessageTemplateService.java | 2 ++ .../impl/MessageTemplateServiceImpl.java | 18 ++++++++++++++++++ .../webc/MiniMessageTemplateController.java | 5 +++++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml index a5e4d8fce..7022ac172 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMessageMapper.xml @@ -195,9 +195,11 @@ b.message_image, a.create_time, a.read_status as readStatus, + a.process_status as processStatus, b.deadline as deadline, b.publisher_user_id as publishUserId, - b.message_content as messageContent + b.message_content as messageContent, + b.process_type as processType, from zxjp_store_message a left join zxjp_message_template b on a.message_template_id = b.id 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 f075779ac..78fa5049a 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 @@ -36,4 +36,8 @@ public class MessageDetailVO { private Integer readStatus; + private Integer processStatus; + + private Integer processType; + } 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 190a7ea30..dd9424a70 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 @@ -92,5 +92,7 @@ public interface MessageTemplateService { Boolean readMessage(Long id, PartnerUserInfoVO userInfoVO); + Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO); + } 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 a96b8f61b..e321196a6 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 @@ -340,6 +340,24 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { return Boolean.TRUE; } + @Override + public Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO) { + log.info("handleMessage request:{}，处理人：{}", JSONObject.toJSONString(id), userInfoVO.getUsername()); + StoreMessageDO message = storeMessageDAO.getById(id); + if (message==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + message.setProcessStatus(ProcessStatusEnum.PROCESSED.getCode()); + message.setProcessTime(new Date()); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile()); + if (enterpriseUserDO != null){ + message.setActualOperatorId(enterpriseUserDO.getId()); + message.setActualOperatorName(enterpriseUserDO.getName()); + } + storeMessageDAO.update( message); + return Boolean.TRUE; + } + public Map> getAuthUser(List personInfo, List storeIds){ if (CollectionUtils.isEmpty(personInfo)){ 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 0260cb074..9d46ede11 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 @@ -55,5 +55,10 @@ public class MiniMessageTemplateController { return ResponseResult.success(messageTemplateService.readMessage(id, PartnerUserHolder.getUser())); } + @ApiOperation("确认已处理") + @GetMapping("/handleMessage") + public ResponseResult handleMessage(@RequestParam("id")Long id) { + return ResponseResult.success(messageTemplateService.handleMessage(id, PartnerUserHolder.getUser())); + } }