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 567103c82..941a8a741 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 @@ -91,15 +91,15 @@ public interface MessageTemplateService { */ Boolean revokeById(Long id, LoginUserInfo user); - List getModuleList(String storeId,PartnerUserInfoVO userInfoVO); + List getModuleList(String storeId,String mobile); PageInfo getStorePendingList(StoreMessagePendingRequest request); MessageDetailVO getMessageDetail(Long id); - Boolean readMessage(Long id, PartnerUserInfoVO userInfoVO); + Boolean readMessage(Long id, String mobile); - Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO); + Boolean handleMessage(Long id, String userName,String mobile); ApiResponse thirdHandleMessage(ThirdHandleMessageRequest 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 76c985caa..0ee448fe7 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 @@ -463,9 +463,9 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } @Override - public List getModuleList(String storeId,PartnerUserInfoVO userInfoVO) { + public List getModuleList(String storeId,String mobile) { List moduleAndMatterList = ModuleAndMatterVO.getModuleAndMatterList(); - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile()); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile); if (enterpriseUserDO == null){ enterpriseUserDO = new EnterpriseUserDO(); } @@ -508,7 +508,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } @Override - public Boolean readMessage(Long id, PartnerUserInfoVO userInfoVO) { + public Boolean readMessage(Long id, String mobile) { StoreMessageDO message = storeMessageDAO.getById(id); if (ProcessStatusEnum.PROCESSED.getCode().equals(message.getProcessStatus())){ log.info("当前消息已读已处理:{}",JSONObject.toJSONString( message)); @@ -520,7 +520,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { if (ProcessTypeEnum.READ.getCode().equals(template.getProcessType())){ message.setProcessStatus(ProcessStatusEnum.PROCESSED.getCode()); message.setProcessTime(new Date()); - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile()); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile); if (enterpriseUserDO != null){ message.setActualOperatorId(enterpriseUserDO.getId()); message.setActualOperatorName(enterpriseUserDO.getName()); @@ -531,15 +531,15 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { } @Override - public Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO) { - log.info("handleMessage request:{},处理人:{}", JSONObject.toJSONString(id), userInfoVO.getUsername()); + public Boolean handleMessage(Long id, String userName,String mobile) { + log.info("handleMessage request:{},处理人:{}", JSONObject.toJSONString(id), userName); 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()); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile); if (enterpriseUserDO != null){ message.setActualOperatorId(enterpriseUserDO.getId()); message.setActualOperatorName(enterpriseUserDO.getName()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java index e9a3e66f4..5b51d7a44 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java @@ -1,12 +1,12 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.dto.notice.NoticeDTO; import com.cool.store.request.notice.*; import com.cool.store.response.ResponseResult; import com.cool.store.service.MessageTemplateService; -import com.cool.store.vo.notice.MessageTemplateDetailVO; -import com.cool.store.vo.notice.StoreMessageDetailVO; +import com.cool.store.vo.notice.*; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -87,5 +87,34 @@ public class MessageTemplateController { return ResponseResult.success(messageTemplateService.revokeById(id,CurrentUserHolder.getUser())); } + @ApiOperation("获取每个门店需要展示的模块") + @GetMapping("/getModuleListByStoreId") + public ResponseResult> getModuleListByStoreId(@RequestParam("id")String storeId) { + return ResponseResult.success(messageTemplateService.getModuleList(storeId, CurrentUserHolder.getUser().getMobile())); + } + @ApiOperation("获取消息详情") + @GetMapping("/getMessageDetail") + public ResponseResult getMessageDetail(@RequestParam("id")Long id) { + return ResponseResult.success(messageTemplateService.getMessageDetail(id)); + } + + @ApiOperation("待办列表/模块列表") + @PostMapping("/getStorePendingList") + public ResponseResult> getStorePendingList(@RequestBody StoreMessagePendingRequest request) { + return ResponseResult.success(messageTemplateService.getStorePendingList(request)); + } + + @ApiOperation("确认已读") + @GetMapping("/readMessage") + public ResponseResult readMessage(@RequestParam("id")Long id) { + return ResponseResult.success(messageTemplateService.readMessage(id, CurrentUserHolder.getUser().getMobile())); + } + + @ApiOperation("确认已处理") + @GetMapping("/handleMessage") + public ResponseResult handleMessage(@RequestParam("id")Long id) { + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(messageTemplateService.handleMessage(id, user.getName(), user.getMobile())); + } } 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 9d46ede11..b21257317 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 @@ -5,6 +5,7 @@ import com.cool.store.context.PartnerUserHolder; import com.cool.store.request.notice.StoreMessagePendingRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.MessageTemplateService; +import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.notice.MessageDetailVO; import com.cool.store.vo.notice.ModuleAndMatterVO; import com.cool.store.vo.notice.StoreMessageVO; @@ -34,7 +35,7 @@ public class MiniMessageTemplateController { @ApiOperation("获取每个门店需要展示的模块") @GetMapping("/getModuleListByStoreId") public ResponseResult> getModuleListByStoreId(@RequestParam("id")String storeId) { - return ResponseResult.success(messageTemplateService.getModuleList(storeId, PartnerUserHolder.getUser())); + return ResponseResult.success(messageTemplateService.getModuleList(storeId, PartnerUserHolder.getUser().getMobile())); } @ApiOperation("获取消息详情") @@ -52,13 +53,14 @@ public class MiniMessageTemplateController { @ApiOperation("确认已读") @GetMapping("/readMessage") public ResponseResult readMessage(@RequestParam("id")Long id) { - return ResponseResult.success(messageTemplateService.readMessage(id, PartnerUserHolder.getUser())); + return ResponseResult.success(messageTemplateService.readMessage(id, PartnerUserHolder.getUser().getMobile())); } @ApiOperation("确认已处理") @GetMapping("/handleMessage") public ResponseResult handleMessage(@RequestParam("id")Long id) { - return ResponseResult.success(messageTemplateService.handleMessage(id, PartnerUserHolder.getUser())); + PartnerUserInfoVO user = PartnerUserHolder.getUser(); + return ResponseResult.success(messageTemplateService.handleMessage(id, user.getUsername(), user.getMobile())); } }