fix:补充遗失代码

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<ModuleAndMatterVO> getModuleList(String storeId,PartnerUserInfoVO userInfoVO);
+    List<ModuleAndMatterVO> getModuleList(String storeId,String mobile);
 
     PageInfo<StoreMessageVO> 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<Boolean> thirdHandleMessage(ThirdHandleMessageRequest request);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java

@@ -377,9 +377,9 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
     }
 
     @Override
-    public List<ModuleAndMatterVO> getModuleList(String storeId,PartnerUserInfoVO userInfoVO) {
+    public List<ModuleAndMatterVO> getModuleList(String storeId,String mobile) {
         List<ModuleAndMatterVO> moduleAndMatterList = ModuleAndMatterVO.getModuleAndMatterList();
-        EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile());
+        EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
         if (enterpriseUserDO == null){
             enterpriseUserDO = new EnterpriseUserDO();
         }
@@ -422,7 +422,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));
@@ -434,7 +434,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());
@@ -445,15 +445,15 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
     }
 
     @Override
-    public Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO) {
+    public Boolean handleMessage(Long id, String userName,String mobile) {
-        log.info("handleMessage request:{}，处理人：{}", JSONObject.toJSONString(id), userInfoVO.getUsername());
+        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());

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.*;
-import com.cool.store.vo.notice.StoreMessageDetailVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -86,5 +86,34 @@ public class MessageTemplateController {
         return ResponseResult.success(messageTemplateService.revokeById(id,CurrentUserHolder.getUser()));
     }
 
+    @ApiOperation("获取每个门店需要展示的模块")
+    @GetMapping("/getModuleListByStoreId")
+    public ResponseResult<List<ModuleAndMatterVO>> getModuleListByStoreId(@RequestParam("id")String storeId) {
+        return ResponseResult.success(messageTemplateService.getModuleList(storeId, CurrentUserHolder.getUser().getMobile()));
+    }
 
+    @ApiOperation("获取消息详情")
+    @GetMapping("/getMessageDetail")
+    public ResponseResult<MessageDetailVO> getMessageDetail(@RequestParam("id")Long id) {
+        return ResponseResult.success(messageTemplateService.getMessageDetail(id));
+    }
+
+    @ApiOperation("待办列表/模块列表")
+    @PostMapping("/getStorePendingList")
+    public ResponseResult<PageInfo<StoreMessageVO>> getStorePendingList(@RequestBody StoreMessagePendingRequest request) {
+        return ResponseResult.success(messageTemplateService.getStorePendingList(request));
+    }
+
+    @ApiOperation("确认已读")
+    @GetMapping("/readMessage")
+    public ResponseResult<Boolean> readMessage(@RequestParam("id")Long id) {
+        return ResponseResult.success(messageTemplateService.readMessage(id, CurrentUserHolder.getUser().getMobile()));
+    }
+
+    @ApiOperation("确认已处理")
+    @GetMapping("/handleMessage")
+    public ResponseResult<Boolean> handleMessage(@RequestParam("id")Long id) {
+        LoginUserInfo user = CurrentUserHolder.getUser();
+        return ResponseResult.success(messageTemplateService.handleMessage(id, user.getName(), user.getMobile()));
+    }
 }

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<List<ModuleAndMatterVO>> 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<Boolean> 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<Boolean> 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()));
     }
 
 }