Merge branch 'master' into cc_20250723_Decoration

# Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-08-07 18:03:44 +08:00
parent aa1e6fdb22 3cec36c542
commit 3f33ed21cb
65 changed files with 3480 additions and 14 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CommonEnumController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CommonEnumController.java
@@ -0,0 +1,39 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.vo.notice.ModuleAndMatterVO;
+import com.cool.store.vo.shop.ShopStageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/7/24 16:19
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/pc/udc")
+@Api(tags = "PC枚举值")
+@Slf4j
+public class CommonEnumController {
+
+
+    @ApiOperation("获取模块与消息类型")
+    @GetMapping("/getModuleAndMatter")
+    public ResponseResult<List<ModuleAndMatterVO>> getShopSubStageStatusEnum() {
+        return ResponseResult.success(ModuleAndMatterVO.getModuleAndMatterList());
+    }
+
+
+
+
+
+
+
+}
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MatterConfigController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MatterConfigController.java
@@ -0,0 +1,65 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.notice.BatchDeletedRequest;
+import com.cool.store.request.notice.MatterConfigAddRequest;
+import com.cool.store.request.notice.MatterConfigQueryRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.MatterConfigService;
+import com.cool.store.vo.LineInfoVO;
+import com.cool.store.vo.notice.MatterAndMatterDetailVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/7/24 16:40
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/pc/matter/config")
+@Api(tags = "PC事项配置")
+@Slf4j
+public class MatterConfigController {
+
+    @Resource
+    MatterConfigService matterConfigService;
+
+    @PostMapping("/add")
+    @ApiOperation("新增事项配置")
+    public ResponseResult<Integer> addMatterConfig(@RequestBody MatterConfigAddRequest request) {
+        return ResponseResult.success(matterConfigService.addMatterConfig(request, CurrentUserHolder.getUser()));
+    }
+
+    @PostMapping("/edit")
+    @ApiOperation("编辑事项配置")
+    public ResponseResult<Integer> editMatterConfig(@RequestBody MatterConfigAddRequest request) {
+        return ResponseResult.success(matterConfigService.editMatterConfig(request, CurrentUserHolder.getUser()));
+    }
+
+
+    @PostMapping("/deleteMatterConfig")
+    @ApiOperation("批量删除事项配置")
+    public ResponseResult<Boolean> addMatterConfig(@RequestBody BatchDeletedRequest request) {
+        return ResponseResult.success(matterConfigService.deleteMatterConfig(request.getIds(),   CurrentUserHolder.getUser()));
+    }
+
+    @PostMapping("/list")
+    @ApiOperation("事项配置列表")
+    public ResponseResult<PageInfo<MatterAndMatterDetailVO>> listByCondition(@RequestBody MatterConfigQueryRequest request) {
+        return ResponseResult.success(matterConfigService.listByCondition(request));
+    }
+
+
+
+
+
+}
--- 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
@@ -0,0 +1,90 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+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.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/7/25 15:08
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/pc/notice")
+@Api(tags = "PC事项/通知管理")
+@Slf4j
+public class MessageTemplateController {
+
+
+    @Resource
+    MessageTemplateService messageTemplateService;
+
+
+    @PostMapping("/add")
+    @ApiOperation("新增消息通知")
+    public ResponseResult<Boolean> messageTemplateService(@RequestBody MessageTemplateAddRequest request) {
+        return ResponseResult.success(messageTemplateService.addMessageTemplate(request, CurrentUserHolder.getUser()));
+    }
+
+    @PostMapping("/edit")
+    @ApiOperation("编辑消息通知")
+    public ResponseResult<Boolean> editMessageTemplate(@RequestBody MessageTemplateAddRequest request) {
+        return ResponseResult.success(messageTemplateService.editMessageTemplate(request, CurrentUserHolder.getUser()));
+    }
+
+    @ApiOperation("通知详情")
+    @GetMapping("/getMessageTemplateDetail")
+    public ResponseResult<MessageTemplateDetailVO> getMessageTemplateDetail(@RequestParam("id")Long id) {
+        return ResponseResult.success(messageTemplateService.getMessageTemplateDetail(id));
+    }
+
+    @PostMapping("/batchDelete")
+    @ApiOperation("批量删除")
+    public ResponseResult<Boolean> editMessageTemplate(@RequestBody BatchDeletedRequest request) {
+        return ResponseResult.success(messageTemplateService.batchDeleteMessageTemplate(request, CurrentUserHolder.getUser()));
+    }
+
+    @PostMapping("/batchPublish")
+    @ApiOperation("批量发布")
+    public ResponseResult<Boolean> batchPublishMessageTemplate(@RequestBody BatchPublishRequest request) {
+        return ResponseResult.success(messageTemplateService.batchPublishMessageTemplate(request, CurrentUserHolder.getUser()));
+    }
+
+    @PostMapping("/getMessageTemplateList")
+    @ApiOperation("通知管理列表/事项管理列表")
+    public ResponseResult<PageInfo<NoticeDTO>> getMessageTemplateList(@RequestBody MessageTemplateQueryRequest request) {
+        return ResponseResult.success(messageTemplateService.getMessageTemplateList(request));
+    }
+
+    @PostMapping("/getStoreMessageListByTemplateId")
+    @ApiOperation("进度管理")
+    public ResponseResult<PageInfo<StoreMessageDetailVO>> getStoreMessageListByTemplateId(@RequestBody StoreMessageRequest request) {
+        return ResponseResult.success(messageTemplateService.getStoreMessageListByTemplateId(request));
+    }
+
+    @PostMapping("/batchRevokeNotice")
+    @ApiOperation("批量撤销")
+    public ResponseResult<Boolean> batchRevokeNotice(@RequestBody BatchRevokeRequest request) {
+        return ResponseResult.success(messageTemplateService.batchRevokeNotice(request,CurrentUserHolder.getUser()));
+    }
+
+    @ApiOperation("撤销单个门店消息")
+    @GetMapping("/revokeById")
+    public ResponseResult<Boolean> revokeById(@RequestParam("id")Long id) {
+        return ResponseResult.success(messageTemplateService.revokeById(id,CurrentUserHolder.getUser()));
+    }
+
+
+}
--- 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
@@ -0,0 +1,64 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.context.CurrentUserHolder;
+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.notice.MessageDetailVO;
+import com.cool.store.vo.notice.ModuleAndMatterVO;
+import com.cool.store.vo.notice.StoreMessageVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/7/27 21:04
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/mini/notice")
+@Api(tags = "mini事项/通知管理")
+@Slf4j
+public class MiniMessageTemplateController {
+
+    @Resource
+    private MessageTemplateService messageTemplateService;
+
+    @ApiOperation("获取每个门店需要展示的模块")
+    @GetMapping("/getModuleListByStoreId")
+    public ResponseResult<List<ModuleAndMatterVO>> getModuleListByStoreId(@RequestParam("id")String storeId) {
+        return ResponseResult.success(messageTemplateService.getModuleList(storeId, PartnerUserHolder.getUser()));
+    }
+
+    @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, PartnerUserHolder.getUser()));
+    }
+
+    @ApiOperation("确认已处理")
+    @GetMapping("/handleMessage")
+    public ResponseResult<Boolean> handleMessage(@RequestParam("id")Long id) {
+        return ResponseResult.success(messageTemplateService.handleMessage(id, PartnerUserHolder.getUser()));
+    }
+
+}
--- a/coolstore-partner-web/src/main/resources/application-test.properties
+++ b/coolstore-partner-web/src/main/resources/application-test.properties
@@ -5,7 +5,7 @@ default.datasource.username=coolstore
 default.datasource.password=CSCErYcXniNYm7bT

 #redis
-redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0
+redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege-open.redis.rds.aliyuncs.com:6379/0

 #pagehelper
 pagehelper.helper-dialect=mysql