suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250903_big_screen' into 'master'

Browse Source 
fix:补充遗失代码

See merge request hangzhou/java/custom_zxjp!173
This commit is contained in:
苏竹红
2025-10-23 10:31:05 +00:00
parent 8cfee17a13 7c44ec246e
commit 000d9e8111
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java
View File

@@ -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);

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

@@ -463,9 +463,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();
}
@@ -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());

33
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java
View File

@@ -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<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()));
}
}

8
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java
View File

@@ -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()));
}
}