From e76afc52327bacba5a70d8790ef07cfed78b858b Mon Sep 17 00:00:00 2001
From: leomonM <2233021400@qq.com>
Date: Thu, 21 Aug 2025 22:55:14 +0800
Subject: [PATCH] 消息中心
---
oying-system/src/main/java/com/oying/modules/message/mapper/MesMsgRecordMapper.java | 34 +
oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java | 150 ++++----
oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java | 113 ++---
oying-system/src/main/java/com/oying/modules/message/service/MesCustomerCommentMsgService.java | 83 ++-
oying-system/src/main/java/com/oying/modules/message/service/impl/MesCustomerCommentMsgServiceImpl.java | 109 +++++
oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java | 38 +
.idea/misc.xml | 2
oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java | 113 ++---
/dev/null | 26 -
oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java | 117 +++---
.idea/compiler.xml | 10
oying-system/src/main/resources/mapper/message/MesMsgRecordMapper.xml | 80 ++-
oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java | 77 ++-
oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java | 119 +++---
14 files changed, 567 insertions(+), 504 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8f29a85..b697d3f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,11 +17,11 @@
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
- <module name="oying-common" options="-parameters" />
- <module name="oying-generator" options="-parameters" />
- <module name="oying-logging" options="-parameters" />
- <module name="oying-system" options="-parameters" />
- <module name="oying-tools" options="-parameters" />
+ <module name="oying-common" options="" />
+ <module name="oying-generator" options="" />
+ <module name="oying-logging" options="" />
+ <module name="oying-system" options="" />
+ <module name="oying-tools" options="" />
</option>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5cd614..b784bbc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderBuyer.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderBuyer.java
deleted file mode 100644
index fca85bf..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderBuyer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.oying.modules.message.domain;
-
-import com.oying.base.BaseEntity;
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
-* @description /
-* @author 李萌
-* @date 2025-05-20
-**/
-@Data
-@TableName("message_order_buyer")
-public class MessageOrderBuyer extends BaseEntity implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增 用户id")
- private Integer id;
-
- @NotNull
- @ApiModelProperty(value = "订单ID")
- private Integer orderId;
-
- @NotBlank
- @ApiModelProperty(value = "消息类型（订单状态变化、订单送达）")
- private String messageType;
-
- @NotBlank
- @ApiModelProperty(value = "消息内容")
- private String messageContent;
-
- @NotBlank
- @ApiModelProperty(value = "跳转链接")
- private String link;
-
-// @ApiModelProperty(value = "创建时间")
-// private Timestamp createTime;
-
- public void copy(MessageOrderBuyer source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderLeave.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderLeave.java
deleted file mode 100644
index 8556bd6..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderLeave.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.oying.modules.message.domain;
-
-import com.oying.base.BaseEntity;
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
-* @description /
-* @author 李萌
-* @date 2025-05-20
-**/
-@Data
-@TableName("message_order_leave")
-public class MessageOrderLeave extends BaseEntity implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增")
- private Integer id;
-
- @NotNull
- @ApiModelProperty(value = "订单ID")
- private Integer orderId;
-
- @NotBlank
- @ApiModelProperty(value = "顾客评价内容")
- private String customerReview="顾客尚未评价";
-
- @NotBlank
- @ApiModelProperty(value = "商家回复内容")
- private String sellerReply="商家尚未回复";
-
- @NotBlank
- @ApiModelProperty(value = "跳转链接")
- private String link="https://example.com/default-link";
-
-// @ApiModelProperty(value = "创建时间")
-// private Timestamp createTime;
-
- public void copy(MessageOrderLeave source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java
deleted file mode 100644
index d39132a..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.oying.modules.message.domain;
-
-import com.oying.base.BaseEntity;
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
-* @description /
-* @author 李萌
-* @date 2025-05-20
-**/
-@Data
-@TableName("message_order_seller")
-public class MessageOrderSeller extends BaseEntity implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "id")
- private Integer id;
-
- // 订单id String
- @ApiModelProperty(value = "orderId")
- private String orderId;
-
-
- @ApiModelProperty(value = "storeId")
- private Integer storeId;
-
-
- @ApiModelProperty(value = "messageType")
- private String messageType;
-
-
- @ApiModelProperty(value = "messageContent")
- private String messageContent;
-
-
- @ApiModelProperty(value = "link")
- private String link;
-
- //0未读 1已读
- @ApiModelProperty(value = "flag")
- private Integer flag=0;
-
-// @ApiModelProperty(value = "createTime")
-// private Timestamp createTime;
-
- public void copy(MessageOrderSeller source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java
deleted file mode 100644
index 6120049..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.oying.modules.message.domain;
-
-import com.oying.base.BaseEntity;
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import javax.rmi.CORBA.Tie;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * @description /
- * @author 李萌
- * @date 2025-05-20
- **/
-@Data
-@TableName("message_system")
-public class MessageSystem extends BaseEntity implements Serializable {
-
- //使用数据库的自增策略来生成id
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "id")
- private Integer id;
-
- @NotNull
- @ApiModelProperty(value = "系统维护开始时间")
- private Timestamp startTime;
-
- @NotNull
- @ApiModelProperty(value = "系统维护截至时间")
- private Timestamp endTime;
-
- public void copy(MessageSystem source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystemAdvertise.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystemAdvertise.java
deleted file mode 100644
index c01e7e4..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystemAdvertise.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.oying.modules.message.domain;
-
-import com.oying.base.BaseEntity;
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
-* @description /
-* @author leomon
-* @date 2025-06-05
-**/
-@Data
-@TableName("message_system_advertise")
-public class MessageSystemAdvertise extends BaseEntity implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键ID")
- private Long id;
-
- @ApiModelProperty(value = "广告标题")
- private String title;
-
- @ApiModelProperty(value = "广告内容")
- private String content;
-
- @ApiModelProperty(value = "广告图片链接")
- private String imageUrl;
-
- @ApiModelProperty(value = "广告跳转链接")
- private String linkUrl;
-
- @NotNull
- @ApiModelProperty(value = "广告状态（0: 禁用；1: 启用）")
- private Integer status;
-
-// @ApiModelProperty(value = "创建人")
-// private String createBy;
-//
-// @ApiModelProperty(value = "更新人")
-// private String updateBy;
-//
-// @NotNull
-// @ApiModelProperty(value = "创建时间")
-// private Timestamp createTime;
-//
-// @NotNull
-// @ApiModelProperty(value = "更新时间")
-// private Timestamp updateTime;
-
- public void copy(MessageSystemAdvertise source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java
deleted file mode 100644
index 0ccbeef..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.oying.modules.message.domain.dto;
-
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@Data
-public class MessageOrderBuyerQueryCriteria{
-
- @ApiModelProperty(value = "页码", example = "1")
- private Integer page = 1;
-
- @ApiModelProperty(value = "每页数据量", example = "10")
- private Integer size = 10;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java
deleted file mode 100644
index c0c98b9..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.oying.modules.message.domain.dto;
-
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@Data
-public class MessageOrderLeaveQueryCriteria{
-
- @ApiModelProperty(value = "页码", example = "1")
- private Integer page = 1;
-
- @ApiModelProperty(value = "每页数据量", example = "10")
- private Integer size = 10;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerDTO.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerDTO.java
deleted file mode 100644
index ac6906e..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.oying.modules.message.domain.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MessageOrderSellerDTO {
- //加一个主键
-
- private Integer id;
-
- private Integer orderId;
-
-// private String messageType;
-
- private String messageContent;
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java
deleted file mode 100644
index c514533..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.oying.modules.message.domain.dto;
-
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@Data
-public class MessageOrderSellerQueryCriteria{
-
- @ApiModelProperty(value = "页码", example = "1")
- private Integer page = 1;
-
- @ApiModelProperty(value = "每页数据量", example = "10")
- private Integer size = 10;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemAdvertiseQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemAdvertiseQueryCriteria.java
deleted file mode 100644
index 6fc9421..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemAdvertiseQueryCriteria.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.oying.modules.message.domain.dto;
-
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
-* @author leomon
-* @date 2025-06-05
-**/
-@Data
-public class MessageSystemAdvertiseQueryCriteria{
-
- @ApiModelProperty(value = "页码", example = "1")
- private Integer page = 1;
-
- @ApiModelProperty(value = "每页数据量", example = "10")
- private Integer size = 10;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemQueryCriteria.java
deleted file mode 100644
index 0ba80fc..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemQueryCriteria.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.oying.modules.message.domain.dto;
-
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @author 李萌
- * @date 2025-05-20
- **/
-@Data
-public class MessageSystemQueryCriteria{
-
- @ApiModelProperty(value = "页码", example = "1")
- private Integer page = 1;
-
- @ApiModelProperty(value = "每页数据量", example = "10")
- private Integer size = 10;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MesMsgRecordMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MesMsgRecordMapper.java
index c466fcf..b3d0c3a 100644
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MesMsgRecordMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/message/mapper/MesMsgRecordMapper.java
@@ -1,23 +1,22 @@
package com.oying.modules.message.mapper;
-import com.oying.modules.message.common.OrderStatusEnum;
-import com.oying.modules.message.domain.MesMsgRecord;
-import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
-import java.util.List;
-
-import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
-import com.oying.modules.message.domain.myDto.MesMsgRecordQueryPollDto;
-import com.oying.modules.message.domain.myDto.MesMsgRecordQuerySystemDto;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.oying.modules.message.domain.MesMsgRecord;
+import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
+import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
+import com.oying.modules.message.domain.myDto.MesMsgRecordQueryPollDto;
+import com.oying.modules.message.domain.myDto.MesMsgRecordQuerySystemDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@Mapper
public interface MesMsgRecordMapper extends BaseMapper<MesMsgRecord> {
@@ -25,14 +24,17 @@
List<MesMsgRecord> findAll(@Param("criteria") MesMsgRecordQueryCriteria criteria);
- List<MesMsgRecordQueryPollDto> PollMes(Long platform);
- void batchMarkRead(Long platform,List<Long> msgIds);
+ List<MesMsgRecordQueryPollDto> PollMes(@Param("platform") Long platform, @Param("msgType") Long msgType);
- IPage<MesMsgRecordQuerySystemDto> queryAllSysNotice(@Param("criteria")MesMsgRecordQueryCriteria criteria, Page<Object> page);
+
+ void batchMarkRead(Long platform, List<Long> msgIds);
+
+ IPage<MesMsgRecordQuerySystemDto> queryAllSysNotice(@Param("criteria") MesMsgRecordQueryCriteria criteria, Page<Object> page);
List<MesMsgRecordQueryOrderDto> queryorder(Long shopId);
+ List<MesMsgRecordQueryPollDto> PollMesAll(@Param("platform") Long platform);
// IPage<MesMsgRecord> findAll(@Param("criteria") MesMsgRecordQueryCriteria criteria, Page<Object> page);
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderBuyerMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderBuyerMapper.java
deleted file mode 100644
index b8d6ac1..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderBuyerMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageOrderBuyer;
-import com.oying.modules.message.domain.dto.MessageOrderBuyerQueryCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@Mapper
-public interface MessageOrderBuyerMapper extends BaseMapper<MessageOrderBuyer> {
-
- IPage<MessageOrderBuyer> findAll(@Param("criteria") MessageOrderBuyerQueryCriteria criteria, Page<Object> page);
-
- List<MessageOrderBuyer> findAll(@Param("criteria") MessageOrderBuyerQueryCriteria criteria);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderLeaveMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderLeaveMapper.java
deleted file mode 100644
index 4adbee8..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderLeaveMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageOrderLeave;
-import com.oying.modules.message.domain.dto.MessageOrderLeaveQueryCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@Mapper
-public interface MessageOrderLeaveMapper extends BaseMapper<MessageOrderLeave> {
-
- IPage<MessageOrderLeave> findAll(@Param("criteria") MessageOrderLeaveQueryCriteria criteria, Page<Object> page);
-
- List<MessageOrderLeave> findAll(@Param("criteria") MessageOrderLeaveQueryCriteria criteria);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderSellerMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderSellerMapper.java
deleted file mode 100644
index 18306cb..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderSellerMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageOrderSeller;
-import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@Mapper
-public interface MessageOrderSellerMapper extends BaseMapper<MessageOrderSeller> {
-
- IPage<MessageOrderSeller> findAll(@Param("criteria") MessageOrderSellerQueryCriteria criteria, Page<Object> page);
-
- List<MessageOrderSeller> findAll(@Param("criteria") MessageOrderSellerQueryCriteria criteria);
-
- List<MessageOrderSeller> findByStoreId(String storeId);
-
- Boolean updateMessageOrderSellerRead(Integer orderId);
-
- boolean saveMessageOrderSellerByOrderIdAndStoreId(MessageOrderSeller resources);
-
- boolean updateReadStatusById(Integer id);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemAdvertiseMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemAdvertiseMapper.java
deleted file mode 100644
index 99c0539..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemAdvertiseMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageSystemAdvertise;
-import com.oying.modules.message.domain.dto.MessageSystemAdvertiseQueryCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
-* @author leomon
-* @date 2025-06-05
-**/
-@Mapper
-public interface MessageSystemAdvertiseMapper extends BaseMapper<MessageSystemAdvertise> {
-
- IPage<MessageSystemAdvertise> findAll(@Param("criteria") MessageSystemAdvertiseQueryCriteria criteria, Page<Object> page);
-
- List<MessageSystemAdvertise> findAll(@Param("criteria") MessageSystemAdvertiseQueryCriteria criteria);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemMapper.java
deleted file mode 100644
index 959cde3..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageSystem;
-import com.oying.modules.message.domain.dto.MessageSystemQueryCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
- * @author 李萌
- * @date 2025-05-20
- **/
-@Mapper
-public interface MessageSystemMapper extends BaseMapper<MessageSystem> {
-
- IPage<MessageSystem> findAll(@Param("criteria") MessageSystemQueryCriteria criteria, Page<Object> page);
-
- List<MessageSystem> findAll(@Param("criteria") MessageSystemQueryCriteria criteria);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java
index ec4a9f7..89cbb50 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java
@@ -1,86 +1,79 @@
package com.oying.modules.message.rest;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MesCustomerCommentMsg;
-import com.oying.modules.message.domain.dto.MesShopMsgRespDTO;
import com.oying.modules.message.domain.myDto.MesCustomerCommentMsgDTO;
import com.oying.modules.message.service.MesCustomerCommentMsgService;
-import com.oying.modules.message.domain.dto.MesCustomerCommentMsgQueryCriteria;
import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心2.0")
@RequestMapping("/api/mesCustomerCommentMsg")
public class MesCustomerCommentMsgController {
private final MesCustomerCommentMsgService mesCustomerCommentMsgService;
+//
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('mesCustomerCommentMsg:list')")
+// public void exportMesCustomerCommentMsg(HttpServletResponse response, MesCustomerCommentMsgQueryCriteria criteria) throws IOException {
+// mesCustomerCommentMsgService.download(mesCustomerCommentMsgService.queryAll(criteria), response);
+// }
+//
+// @GetMapping
+// @ApiOperation("查询消息")
+// @PreAuthorize("@el.check('mesCustomerCommentMsg:list')")
+// public ResponseEntity<PageResult<MesCustomerCommentMsg>> queryMesCustomerCommentMsg(MesCustomerCommentMsgQueryCriteria criteria) {
+// Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+// return new ResponseEntity<>(mesCustomerCommentMsgService.queryAll(criteria, page), HttpStatus.OK);
+// }
+//
+// @PostMapping
+// @Log("新增消息")
+// @ApiOperation("新增消息")
+// @PreAuthorize("@el.check('mesCustomerCommentMsg:add')")
+// public ResponseEntity<Object> createMesCustomerCommentMsg(@Validated @RequestBody MesCustomerCommentMsg resources) {
+// mesCustomerCommentMsgService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改消息")
+// @ApiOperation("修改消息")
+// @PreAuthorize("@el.check('mesCustomerCommentMsg:edit')")
+// public ResponseEntity<Object> updateMesCustomerCommentMsg(@Validated @RequestBody MesCustomerCommentMsg resources) {
+// mesCustomerCommentMsgService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除消息")
+// @ApiOperation("删除消息")
+// @PreAuthorize("@el.check('mesCustomerCommentMsg:del')")
+// public ResponseEntity<Object> deleteMesCustomerCommentMsg(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+// mesCustomerCommentMsgService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('mesCustomerCommentMsg:list')")
- public void exportMesCustomerCommentMsg(HttpServletResponse response, MesCustomerCommentMsgQueryCriteria criteria) throws IOException {
- mesCustomerCommentMsgService.download(mesCustomerCommentMsgService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('mesCustomerCommentMsg:list')")
- public ResponseEntity<PageResult<MesCustomerCommentMsg>> queryMesCustomerCommentMsg(MesCustomerCommentMsgQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(mesCustomerCommentMsgService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('mesCustomerCommentMsg:add')")
- public ResponseEntity<Object> createMesCustomerCommentMsg(@Validated @RequestBody MesCustomerCommentMsg resources){
- mesCustomerCommentMsgService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('mesCustomerCommentMsg:edit')")
- public ResponseEntity<Object> updateMesCustomerCommentMsg(@Validated @RequestBody MesCustomerCommentMsg resources){
- mesCustomerCommentMsgService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('mesCustomerCommentMsg:del')")
- public ResponseEntity<Object> deleteMesCustomerCommentMsg(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- mesCustomerCommentMsgService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
-
- /* 5. 用店铺id 查询分页顾客留言 */
+ /* 5. 用店铺id 查询分页顾客留言 订单一一顾客*/
@GetMapping("/customerComment")
- @ApiOperation("list查询顾客留言")
+ @ApiOperation("店铺号list查询顾客留言")
public R<List<MesCustomerCommentMsgDTO>> customerComment(
@RequestParam Long shopId) {
try {
- List<MesCustomerCommentMsgDTO> res=mesCustomerCommentMsgService.listCustomerComment(shopId);
+ List<MesCustomerCommentMsgDTO> res = mesCustomerCommentMsgService.listCustomerComment(shopId);
return R.success(res);
} catch (Exception e) {
return R.fail(e.getMessage());
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
index 6d08391..6963524 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
@@ -1,92 +1,86 @@
package com.oying.modules.message.rest;
-import com.oying.annotation.Log;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.message.common.PlatFormEnum;
-import com.oying.modules.message.domain.MesMsgRecord;
-import com.oying.modules.message.domain.dto.MesShopMsgRespDTO;
+import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryPollDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQuerySystemDto;
import com.oying.modules.message.service.MesMsgRecordService;
-import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
+import com.oying.utils.PageResult;
import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
-
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@Slf4j
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心2.0")
@RequestMapping("/api/mesMsgRecord")
public class MesMsgRecordController {
private final MesMsgRecordService mesMsgRecordService;
+//
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('mesMsgRecord:list')")
+// public void exportMesMsgRecord(HttpServletResponse response, MesMsgRecordQueryCriteria criteria) throws IOException {
+// mesMsgRecordService.download(mesMsgRecordService.queryAll(criteria), response);
+// }
+//
+// @GetMapping
+// @ApiOperation("查询消息")
+// @PreAuthorize("@el.check('mesMsgRecord:list')")
+// public ResponseEntity<PageResult<MesMsgRecord>> queryMesMsgRecord(MesMsgRecordQueryCriteria criteria) {
+// Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+// return new ResponseEntity<>(mesMsgRecordService.queryAll(criteria, page), HttpStatus.OK);
+// }
+//
+// @PostMapping
+// @Log("新增消息")
+// @ApiOperation("新增消息")
+// @PreAuthorize("@el.check('mesMsgRecord:add')")
+// public ResponseEntity<Object> createMesMsgRecord(@Validated @RequestBody MesMsgRecord resources) {
+// mesMsgRecordService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改消息")
+// @ApiOperation("修改消息")
+// @PreAuthorize("@el.check('mesMsgRecord:edit')")
+// public ResponseEntity<Object> updateMesMsgRecord(@Validated @RequestBody MesMsgRecord resources) {
+// mesMsgRecordService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除消息")
+// @ApiOperation("删除消息")
+// @PreAuthorize("@el.check('mesMsgRecord:del')")
+// public ResponseEntity<Object> deleteMesMsgRecord(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+// mesMsgRecordService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('mesMsgRecord:list')")
- public void exportMesMsgRecord(HttpServletResponse response, MesMsgRecordQueryCriteria criteria) throws IOException {
- mesMsgRecordService.download(mesMsgRecordService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('mesMsgRecord:list')")
- public ResponseEntity<PageResult<MesMsgRecord>> queryMesMsgRecord(MesMsgRecordQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(mesMsgRecordService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('mesMsgRecord:add')")
- public ResponseEntity<Object> createMesMsgRecord(@Validated @RequestBody MesMsgRecord resources){
- mesMsgRecordService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('mesMsgRecord:edit')")
- public ResponseEntity<Object> updateMesMsgRecord(@Validated @RequestBody MesMsgRecord resources){
- mesMsgRecordService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('mesMsgRecord:del')")
- public ResponseEntity<Object> deleteMesMsgRecord(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- mesMsgRecordService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
-
/* 1. 轮询最新消息（通知栏） */ //todo 轮询啥？
- //只查“未读”消息，不分种类，返回最新 N 条 1=买家 2=商户 3=骑手"
+ //只查“未读”消息，不分种类，返回最新 N 条 1=买家 2=商户 3=骑手" 消息类型为系统消息1？
@GetMapping("/poll")
@ApiOperation("查询轮询消息 1(买家)、2(商户)、3(骑手)")
@PreAuthorize("@el.check('mesMsgRecord:list')")
- public R<List<MesMsgRecordQueryPollDto>> queryMesMsgRecord(@RequestParam Long platform){
+ public R<List<MesMsgRecordQueryPollDto>> queryMesMsgRecord(@RequestParam Long platform) {
//platform 只能为 1 2 3
if (platform == null) {
return R.fail("平台类型不能为空");
@@ -98,13 +92,16 @@
// 实现业务逻辑，调用服务层获取未读消息
try {
- List<MesMsgRecordQueryPollDto> mes=mesMsgRecordService.PollMes(platform);
+// Long system = Long.valueOf(MesTypeEnum.SYSTEM.getKey());
+// List<MesMsgRecordQueryPollDto> mes = mesMsgRecordService.PollMes(platform, system);
+ List<MesMsgRecordQueryPollDto> mes = mesMsgRecordService.PollMesAll(platform);
+
+
return R.success(mes);
} catch (Exception e) {
- log.error("查询轮询消息失败:",e);
+ log.error("查询轮询消息失败:", e);
return R.fail("查询轮询消息失败");
}
-
}
@@ -113,19 +110,20 @@
// @PutMapping("/ack/{msgId}")
// @ApiOperation("确认收到消息")
// public R<Void> ack(@PathVariable Long msgId) {
-//// mesMsgRecordService.markRead(msgId, null);
+
+ /// / mesMsgRecordService.markRead(msgId, null);
// return R.success();
// }
/* 2. 批量确认收到消息 主键*/
@PutMapping("/ack")
- @ApiOperation("批量确认收到消息")
- public R<Void> batchAck(@ApiParam(value = "消息ID数组") @RequestBody List<Long> msgIds,@RequestParam Long platform) {
+ @ApiOperation("批量确认收到消息 主键ids 1(买家)、2(商户)、3(骑手)")
+ public R<Void> batchAck(@ApiParam(value = "消息ID数组") @RequestBody List<Long> msgIds, @RequestParam Long platform) {
if (msgIds == null || msgIds.isEmpty()) {
return R.fail("消息ID列表不能为空");
}
try {
- mesMsgRecordService.batchMarkRead(platform,msgIds);
+ mesMsgRecordService.batchMarkRead(platform, msgIds);
return R.success();
} catch (Exception e) {
log.error("批量确认消息失败，msgIds: {}", msgIds, e);
@@ -140,7 +138,7 @@
MesMsgRecordQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
try {
- PageResult<MesMsgRecordQuerySystemDto> pageResult = mesMsgRecordService.queryAllSysNotice(criteria,page);
+ PageResult<MesMsgRecordQuerySystemDto> pageResult = mesMsgRecordService.queryAllSysNotice(criteria, page);
return R.success(pageResult);
} catch (Exception e) {
log.error("分页查询系统通知失败，criteria: {}", criteria, e);
@@ -152,9 +150,9 @@
/* 4. 用店铺id 查询订单消息 */
@GetMapping("/order")
@ApiOperation("用店铺id 查询订单消息")
- public R<List<MesMsgRecordQueryOrderDto>> order(@PathVariable Long shopId ) {
+ public R<List<MesMsgRecordQueryOrderDto>> order(@RequestParam Long shopId) {
try {
- List<MesMsgRecordQueryOrderDto> res=mesMsgRecordService.queryorder(shopId);
+ List<MesMsgRecordQueryOrderDto> res = mesMsgRecordService.queryorder(shopId);
return R.success(res);
} catch (Exception e) {
log.error("用店铺id 获取订单消息失败，shopId: {}", shopId, e);
@@ -163,10 +161,6 @@
}
}
-
-
-
-
}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
index 2a8d088..e3414d3 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
@@ -1,84 +1,75 @@
package com.oying.modules.message.rest;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MesOrderEvaluation;
-import com.oying.modules.message.domain.MesOrderItemEvaluationDto;
import com.oying.modules.message.domain.myDto.MesOrderEvaluationDto;
import com.oying.modules.message.service.MesOrderEvaluationService;
-import com.oying.modules.message.domain.dto.MesOrderEvaluationQueryCriteria;
import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
+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;
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心2.0")
@RequestMapping("/api/mesOrderEvaluation")
public class MesOrderEvaluationController {
private final MesOrderEvaluationService mesOrderEvaluationService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('mesOrderEvaluation:list')")
- public void exportMesOrderEvaluation(HttpServletResponse response, MesOrderEvaluationQueryCriteria criteria) throws IOException {
- mesOrderEvaluationService.download(mesOrderEvaluationService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:list')")
- public ResponseEntity<PageResult<MesOrderEvaluation>> queryMesOrderEvaluation(MesOrderEvaluationQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(mesOrderEvaluationService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:add')")
- public ResponseEntity<Object> createMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
- mesOrderEvaluationService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:edit')")
- public ResponseEntity<Object> updateMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
- mesOrderEvaluationService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:del')")
- public ResponseEntity<Object> deleteMesOrderEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- mesOrderEvaluationService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
+//
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('mesOrderEvaluation:list')")
+// public void exportMesOrderEvaluation(HttpServletResponse response, MesOrderEvaluationQueryCriteria criteria) throws IOException {
+// mesOrderEvaluationService.download(mesOrderEvaluationService.queryAll(criteria), response);
+// }
+//
+// @GetMapping
+// @ApiOperation("查询消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:list')")
+// public ResponseEntity<PageResult<MesOrderEvaluation>> queryMesOrderEvaluation(MesOrderEvaluationQueryCriteria criteria){
+// Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+// return new ResponseEntity<>(mesOrderEvaluationService.queryAll(criteria,page),HttpStatus.OK);
+// }
+//
+// @PostMapping
+// @Log("新增消息")
+// @ApiOperation("新增消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:add')")
+// public ResponseEntity<Object> createMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
+// mesOrderEvaluationService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改消息")
+// @ApiOperation("修改消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:edit')")
+// public ResponseEntity<Object> updateMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
+// mesOrderEvaluationService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除消息")
+// @ApiOperation("删除消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:del')")
+// public ResponseEntity<Object> deleteMesOrderEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+// mesOrderEvaluationService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
//对一个店铺评价 + 打分
//order_eval_id, order_item_id, goods_id, goods_name, goods_pic, score, content, imgs, buyer_id
@PostMapping("/addShopEvaluation")
- @ApiOperation("对一个商品评价 + 打分")
- public R<Object> addGoodsEvaluation(@RequestBody MesOrderEvaluationDto resources){
+ @ApiOperation("对一个店铺评价 + 打分")
+ public R<Object> addGoodsEvaluation(@RequestBody MesOrderEvaluationDto resources) {
try {
mesOrderEvaluationService.addShopEvaluation(resources);
return R.success();
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java
index 77a120f..b6f56bb 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java
@@ -1,82 +1,75 @@
package com.oying.modules.message.rest;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MesOrderItemEvaluation;
import com.oying.modules.message.domain.MesOrderItemEvaluationDto;
import com.oying.modules.message.service.MesOrderItemEvaluationService;
-import com.oying.modules.message.domain.dto.MesOrderItemEvaluationQueryCriteria;
import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
+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;
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心2.0")
@RequestMapping("/api/mesOrderItemEvaluation")
public class MesOrderItemEvaluationController {
private final MesOrderItemEvaluationService mesOrderItemEvaluationService;
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('mesOrderItemEvaluation:list')")
- public void exportMesOrderItemEvaluation(HttpServletResponse response, MesOrderItemEvaluationQueryCriteria criteria) throws IOException {
- mesOrderItemEvaluationService.download(mesOrderItemEvaluationService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('mesOrderItemEvaluation:list')")
- public ResponseEntity<PageResult<MesOrderItemEvaluation>> queryMesOrderItemEvaluation(MesOrderItemEvaluationQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(mesOrderItemEvaluationService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('mesOrderItemEvaluation:add')")
- public ResponseEntity<Object> createMesOrderItemEvaluation(@Validated @RequestBody MesOrderItemEvaluation resources){
- mesOrderItemEvaluationService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('mesOrderItemEvaluation:edit')")
- public ResponseEntity<Object> updateMesOrderItemEvaluation(@Validated @RequestBody MesOrderItemEvaluation resources){
- mesOrderItemEvaluationService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('mesOrderItemEvaluation:del')")
- public ResponseEntity<Object> deleteMesOrderItemEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- mesOrderItemEvaluationService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
+ //
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('mesOrderItemEvaluation:list')")
+// public void exportMesOrderItemEvaluation(HttpServletResponse response, MesOrderItemEvaluationQueryCriteria criteria) throws IOException {
+// mesOrderItemEvaluationService.download(mesOrderItemEvaluationService.queryAll(criteria), response);
+// }
+//
+// @GetMapping
+// @ApiOperation("查询消息")
+// @PreAuthorize("@el.check('mesOrderItemEvaluation:list')")
+// public ResponseEntity<PageResult<MesOrderItemEvaluation>> queryMesOrderItemEvaluation(MesOrderItemEvaluationQueryCriteria criteria){
+// Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+// return new ResponseEntity<>(mesOrderItemEvaluationService.queryAll(criteria,page),HttpStatus.OK);
+// }
+//
+// @PostMapping
+// @Log("新增消息")
+// @ApiOperation("新增消息")
+// @PreAuthorize("@el.check('mesOrderItemEvaluation:add')")
+// public ResponseEntity<Object> createMesOrderItemEvaluation(@Validated @RequestBody MesOrderItemEvaluation resources){
+// mesOrderItemEvaluationService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改消息")
+// @ApiOperation("修改消息")
+// @PreAuthorize("@el.check('mesOrderItemEvaluation:edit')")
+// public ResponseEntity<Object> updateMesOrderItemEvaluation(@Validated @RequestBody MesOrderItemEvaluation resources){
+// mesOrderItemEvaluationService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除消息")
+// @ApiOperation("删除消息")
+// @PreAuthorize("@el.check('mesOrderItemEvaluation:del')")
+// public ResponseEntity<Object> deleteMesOrderItemEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+// mesOrderItemEvaluationService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
//对一个商品评价 + 打分
//order_eval_id, order_item_id, goods_id, goods_name, goods_pic, score, content, imgs, buyer_id
@PostMapping("/addGoodsEvaluation")
@ApiOperation("对一个商品评价 + 打分")
- public R<Object> addGoodsEvaluation(@RequestBody MesOrderItemEvaluationDto resources){
+ public R<Object> addGoodsEvaluation(@RequestBody MesOrderItemEvaluationDto resources) {
try {
mesOrderItemEvaluationService.addGoodsEvaluation(resources);
return R.success();
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java
index 390e5c8..f47126c 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java
@@ -1,84 +1,75 @@
package com.oying.modules.message.rest;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MesOrderItemEvaluationDto;
-import com.oying.modules.message.domain.MesRiderEvaluation;
import com.oying.modules.message.domain.myDto.MesRiderEvaluationDto;
import com.oying.modules.message.service.MesRiderEvaluationService;
-import com.oying.modules.message.domain.dto.MesRiderEvaluationQueryCriteria;
import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
+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;
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心2.0")
@RequestMapping("/api/mesRiderEvaluation")
public class MesRiderEvaluationController {
private final MesRiderEvaluationService mesRiderEvaluationService;
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('mesRiderEvaluation:list')")
- public void exportMesRiderEvaluation(HttpServletResponse response, MesRiderEvaluationQueryCriteria criteria) throws IOException {
- mesRiderEvaluationService.download(mesRiderEvaluationService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('mesRiderEvaluation:list')")
- public ResponseEntity<PageResult<MesRiderEvaluation>> queryMesRiderEvaluation(MesRiderEvaluationQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(mesRiderEvaluationService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('mesRiderEvaluation:add')")
- public ResponseEntity<Object> createMesRiderEvaluation(@Validated @RequestBody MesRiderEvaluation resources){
- mesRiderEvaluationService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('mesRiderEvaluation:edit')")
- public ResponseEntity<Object> updateMesRiderEvaluation(@Validated @RequestBody MesRiderEvaluation resources){
- mesRiderEvaluationService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('mesRiderEvaluation:del')")
- public ResponseEntity<Object> deleteMesRiderEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- mesRiderEvaluationService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('mesRiderEvaluation:list')")
+// public void exportMesRiderEvaluation(HttpServletResponse response, MesRiderEvaluationQueryCriteria criteria) throws IOException {
+// mesRiderEvaluationService.download(mesRiderEvaluationService.queryAll(criteria), response);
+// }
+//
+// @GetMapping
+// @ApiOperation("查询消息")
+// @PreAuthorize("@el.check('mesRiderEvaluation:list')")
+// public ResponseEntity<PageResult<MesRiderEvaluation>> queryMesRiderEvaluation(MesRiderEvaluationQueryCriteria criteria){
+// Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+// return new ResponseEntity<>(mesRiderEvaluationService.queryAll(criteria,page),HttpStatus.OK);
+// }
+//
+// @PostMapping
+// @Log("新增消息")
+// @ApiOperation("新增消息")
+// @PreAuthorize("@el.check('mesRiderEvaluation:add')")
+// public ResponseEntity<Object> createMesRiderEvaluation(@Validated @RequestBody MesRiderEvaluation resources){
+// mesRiderEvaluationService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改消息")
+// @ApiOperation("修改消息")
+// @PreAuthorize("@el.check('mesRiderEvaluation:edit')")
+// public ResponseEntity<Object> updateMesRiderEvaluation(@Validated @RequestBody MesRiderEvaluation resources){
+// mesRiderEvaluationService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除消息")
+// @ApiOperation("删除消息")
+// @PreAuthorize("@el.check('mesRiderEvaluation:del')")
+// public ResponseEntity<Object> deleteMesRiderEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+// mesRiderEvaluationService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
//对一个骑手评价 + 打分
//
@PostMapping("/addRiderEvaluation")
@ApiOperation("对一个骑手评价 + 打分")
- public R<Object> addGoodsEvaluation(@RequestBody MesRiderEvaluationDto resources){
+ public R<Object> addGoodsEvaluation(@RequestBody MesRiderEvaluationDto resources) {
try {
mesRiderEvaluationService.addRiderEvaluation(resources);
return R.success();
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java
deleted file mode 100644
index ad275c2..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageOrderBuyer;
-import com.oying.modules.message.service.MessageOrderBuyerService;
-import com.oying.modules.message.domain.dto.MessageOrderBuyerQueryCriteria;
-import com.oying.utils.R;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-//todo
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "买家端订单消息通知")
-@RequestMapping("/api/message/messageOrderBuyer")
-public class MessageOrderBuyerController {
-
- private final MessageOrderBuyerService messageOrderBuyerService;
-
-// @ApiOperation("导出数据")
-// @GetMapping(value = "/download")
-// @PreAuthorize("@el.check('messageOrderBuyer:list')")
-// public void exportMessageOrderBuyer(HttpServletResponse response, MessageOrderBuyerQueryCriteria criteria) throws IOException {
-// messageOrderBuyerService.download(messageOrderBuyerService.queryAll(criteria), response);
-// }
-
- @GetMapping
- @ApiOperation("查询买家端订单消息通知")
- @PreAuthorize("@el.check('messageOrderBuyer:list')")
- public R<PageResult<MessageOrderBuyer>> queryMessageOrderBuyer(MessageOrderBuyerQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-// return new ResponseEntity<>(messageOrderBuyerService.queryAll(criteria,page),HttpStatus.OK);
-
- return R.success(messageOrderBuyerService.queryAll(criteria,page));
- }
-
-// @PostMapping
-// @Log("新增买家端订单消息通知")
-// @ApiOperation("新增买家端订单消息通知")
-// @PreAuthorize("@el.check('messageOrderBuyer:add')")
-// public ResponseEntity<Object> createMessageOrderBuyer(@Validated @RequestBody MessageOrderBuyer resources){
-// messageOrderBuyerService.create(resources);
-// return new ResponseEntity<>(HttpStatus.CREATED);
-// }
-//
-// @PutMapping
-// @Log("修改买家端订单消息通知")
-// @ApiOperation("修改买家端订单消息通知")
-// @PreAuthorize("@el.check('messageOrderBuyer:edit')")
-// public ResponseEntity<Object> updateMessageOrderBuyer(@Validated @RequestBody MessageOrderBuyer resources){
-// messageOrderBuyerService.update(resources);
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-// }
-//
-// @DeleteMapping
-// @Log("删除买家端订单消息通知")
-// @ApiOperation("删除买家端订单消息通知")
-// @PreAuthorize("@el.check('messageOrderBuyer:del')")
-// public ResponseEntity<Object> deleteMessageOrderBuyer(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
-// messageOrderBuyerService.deleteAll(ids);
-// return new ResponseEntity<>(HttpStatus.OK);
-// }
- //订单状态变化通知
- @GetMapping("/status/{order_id}")
- @ApiOperation("查询一条订单状态变化通知")
- public R<String> getMessageOrderBuyer(@PathVariable Integer order_id) {
- MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
- if (messageOrderBuyer != null) {
- String message = messageOrderBuyer.getMessageType();
- return R.success(message);
- } else {
- return R.fail("订单状态变化通知不存在");
- }
-
- }
- //订单送达通知
- @GetMapping("/deliver/{order_id}")
- @ApiOperation("查询一条订单送达通知")
- public R<String> getMessageOrderBuyerDeliver(@PathVariable Integer order_id) {
- MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
- String message = messageOrderBuyer.getMessageType();
- //如果MessageType为订单送达，则返回message——content
- if (message.equals("订单送达")) {
- String messageContent = messageOrderBuyer.getMessageContent();
- return R.success(messageContent);
-// return new ResponseEntity<>(messageContent, HttpStatus.OK);
- }else{
- //返回没送达
- return R.fail("没送达");
-// return new ResponseEntity<>("没送达", HttpStatus.OK);
- }
- }
- //实现点击跳转到订单详情
- @GetMapping("/link/{order_id}")
- @ApiOperation("点击跳转到订单详情")
- public R<String> getMessageOrderBuyerLink(@PathVariable Integer order_id) {
- MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
- String link = messageOrderBuyer.getLink();
-// return new ResponseEntity<>(link, HttpStatus.OK);
- return R.success(link);
- }
-
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java
deleted file mode 100644
index ae2c2ac..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageOrderLeave;
-import com.oying.modules.message.service.MessageOrderLeaveService;
-import com.oying.modules.message.domain.dto.MessageOrderLeaveQueryCriteria;
-import com.oying.utils.R;
-import lombok.RequiredArgsConstructor;
-
-import java.sql.Timestamp;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "消息留言")
-@RequestMapping("/api/message/messageOrderLeave")
-public class MessageOrderLeaveController {
-
- private final MessageOrderLeaveService messageOrderLeaveService;
-
-// @ApiOperation("导出数据")
-// @GetMapping(value = "/download")
-// @PreAuthorize("@el.check('messageOrderLeave:list')")
-// public void exportMessageOrderLeave(HttpServletResponse response, MessageOrderLeaveQueryCriteria criteria) throws IOException {
-// messageOrderLeaveService.download(messageOrderLeaveService.queryAll(criteria), response);
-// }
-
- @GetMapping
- @ApiOperation("查询消息留言")
- @PreAuthorize("@el.check('messageOrderLeave:list')")
- public R<PageResult<MessageOrderLeave>> queryMessageOrderLeave(MessageOrderLeaveQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-// return new ResponseEntity<>(messageOrderLeaveService.queryAll(criteria,page),HttpStatus.OK);
- return R.success(messageOrderLeaveService.queryAll(criteria,page));
- }
-
-
-// @PostMapping
-// @Log("新增消息留言")
-// @ApiOperation("新增消息留言")
-// @PreAuthorize("@el.check('messageOrderLeave:add')")
-// public ResponseEntity<Object> createMessageOrderLeave(@Validated @RequestBody MessageOrderLeave resources){
-// messageOrderLeaveService.create(resources);
-// return new ResponseEntity<>(HttpStatus.CREATED);
-// }
-
-// @PutMapping
-// @Log("修改消息留言")
-// @ApiOperation("修改消息留言")
-// @PreAuthorize("@el.check('messageOrderLeave:edit')")
-// public ResponseEntity<Object> updateMessageOrderLeave(@Validated @RequestBody MessageOrderLeave resources){
-// messageOrderLeaveService.update(resources);
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-// }
-
-// @DeleteMapping
-// @Log("删除消息留言")
-// @ApiOperation("删除消息留言")
-// @PreAuthorize("@el.check('messageOrderLeave:del')")
-// public ResponseEntity<Object> deleteMessageOrderLeave(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
-// messageOrderLeaveService.deleteAll(ids);
-// return new ResponseEntity<>(HttpStatus.OK);
-// }
- //顾客点击订单，传回订单id，根据订单id生成一条 消息留言
-// @PutMapping("/customer/{order_id}")
-// @ApiOperation("顾客点击订单，传回订单id，根据订单id生成一条 留言，此时顾客可以留言")
-// public ResponseEntity<Object> createMessageOrderLeave(@PathVariable("order_id") Integer id,@RequestParam String customerReview) {
-// //创建对象
-// MessageOrderLeave messageOrderLeave = new MessageOrderLeave();
-// messageOrderLeave.setOrderId(id);
-// //如果customerReview为空，默认为“用户未留言”
-// messageOrderLeave.setCustomerReview(customerReview);
-// //设置创建时间为当前时间
-// messageOrderLeave.setCreateTime(new Timestamp(System.currentTimeMillis()));
-// //若表中order_id订单还没存在则调用update留言
-//
-//
-// if(messageOrderLeaveService.findByOrderId(id)==null){
-// messageOrderLeaveService.updateById(messageOrderLeave);
-// return new ResponseEntity<>(HttpStatus.CREATED);
-// } else {
-// // 已存在则不保存，返回 OK 表示成功但无新资源创建
-// return new ResponseEntity<>(HttpStatus.OK);
-// }
-//
-// }
-
- @PutMapping("/customer/{order_id}")
- @ApiOperation("顾客点击订单，传回订单id，根据订单id更新一条留言")
- public R<Object> updateMessageOrderLeaveCustomer(@PathVariable("order_id") Integer id, @RequestBody MessageOrderLeave messageOrderLeave1) {
- // 根据 order_id 查找留言信息
- MessageOrderLeave messageOrderLeave = messageOrderLeaveService.findByOrderId(id);
-
- // 如果留言信息不存在，返回 404 Not Found
- if (messageOrderLeave == null) {
-// return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
- return R.fail("Message order leave not found for order ID: " + id);
- }
-
- // 设置顾客评价内容
- if (messageOrderLeave1.getCustomerReview() != null && !messageOrderLeave1.getCustomerReview().trim().isEmpty()) {
- messageOrderLeave.setCustomerReview(messageOrderLeave1.getCustomerReview());
- } else {
- messageOrderLeave.setCustomerReview("用户未留言");
- }
-
- // 更新最后一次操作的时间
- messageOrderLeave.setCreateTime(new Timestamp(System.currentTimeMillis()));
-
- // 调用服务层更新数据
- boolean updated = messageOrderLeaveService.updateById(messageOrderLeave);
-
- // 如果更新失败，返回 500 Internal Server Error
- if (!updated) {
-// return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
- return R.fail("Failed to update message order leave");
- }
-
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- return R.success(messageOrderLeave);
- }
- //商家对订单id进行回复
-// @PutMapping("/seller/{order_id}")
-// @ApiOperation("商家对订单id进行回复")
-// public ResponseEntity<Object> updateMessageOrderLeave(@PathVariable("order_id") Integer id, @RequestParam String sellerReply) {
-// // 检查 sellerReply 是否为空
-// if (sellerReply == null || sellerReply.trim().isEmpty()) {
-// return new ResponseEntity<>("sellerReply is required", HttpStatus.BAD_REQUEST);
-// }
-//
-// // 根据 order_id 查找留言信息
-// MessageOrderLeave messageOrderLeave = messageOrderLeaveService.findByOrderId(id);
-//
-// // 如果没有找到对应的留言信息，返回 404 Not Found
-// if (messageOrderLeave == null) {
-// return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
-// }
-//
-// // 设置商家回复内容
-// messageOrderLeave.setSellerReply(sellerReply);
-// // 更新最后一次操作的时间
-// messageOrderLeave.setCreateTime(new Timestamp(System.currentTimeMillis()));
-//
-// // 调用服务层更新数据
-// boolean updated = messageOrderLeaveService.updateById(messageOrderLeave);
-//
-// // 如果更新失败，返回 500 Internal Server Error
-// if (!updated) {
-// return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
-// }
-//
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-// }
- //商家对订单id进行回复 订单id必须唯一限制 否则会报错
- @PutMapping("/seller/{order_id}")
- @ApiOperation("商家对订单id进行回复")
- public R<Object> updateMessageOrderLeaveSeller(@PathVariable("order_id") Integer id, @RequestBody MessageOrderLeave messageOrderLeave1) {
- // 根据 order_id 查找留言信息
- MessageOrderLeave messageOrderLeave = messageOrderLeaveService.findByOrderId(id);
-
- // 如果没有找到对应的留言信息，返回 404 Not Found
- if (messageOrderLeave == null) {
-// return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
- return R.fail("Message order leave not found for order ID: " + id);
- }
-
-
- // 设置商家回复内容
- messageOrderLeave.setSellerReply(messageOrderLeave1.getSellerReply());
- // 更新最后一次操作的时间
- messageOrderLeave.setCreateTime(new Timestamp(System.currentTimeMillis()));
-
- // 调用服务层更新数据
- boolean updated = messageOrderLeaveService.updateById(messageOrderLeave);
-
- // 如果更新失败，返回 500 Internal Server Error
- if (!updated) {
-// return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
- return R.fail("Failed to update message order leave");
- }
-
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- return R.success(messageOrderLeave);
- }
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java
deleted file mode 100644
index 0a972a6..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.oying.modules.message.rest;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageOrderSeller;
-import com.oying.modules.message.domain.MessageOrderSeller;
-import com.oying.modules.message.domain.dto.MessageOrderSellerDTO;
-import com.oying.modules.message.service.MessageOrderSellerService;
-import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
-import com.oying.utils.R;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-
-import org.apache.poi.util.Beta;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
-
-/**
-* @author 李萌
-* @date 2025-05-20
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "卖家端订单消息通知")
-@RequestMapping("/api/message/messageOrderSeller")
-public class MessageOrderSellerController {
-
- private final MessageOrderSellerService messageOrderSellerService;
-
-// @ApiOperation("导出数据")
-// @GetMapping(value = "/download")
-// @PreAuthorize("@el.check('messageOrderSeller:list')")
-// public void exportMessageOrderSeller(HttpServletResponse response, MessageOrderSellerQueryCriteria criteria) throws IOException {
-// messageOrderSellerService.download(messageOrderSellerService.queryAll(criteria), response);
-// }
-
- @GetMapping
- @ApiOperation("查询卖家端订单消息通知")
- @PreAuthorize("@el.check('messageOrderSeller:list')")
- public R<PageResult<MessageOrderSeller>> queryMessageOrderSeller(MessageOrderSellerQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-// return new ResponseEntity<>(messageOrderSellerService.queryAll(criteria,page),HttpStatus.OK);
- return R.success(messageOrderSellerService.queryAll(criteria,page));
- }
-
-// @PostMapping
-// @Log("新增卖家端订单消息通知")
-// @ApiOperation("新增卖家端订单消息通知")
-// @PreAuthorize("@el.check('messageOrderSeller:add')")
-// public ResponseEntity<Object> createMessageOrderSeller(@Validated @RequestBody MessageOrderSeller resources){
-// messageOrderSellerService.create(resources);
-// return new ResponseEntity<>(HttpStatus.CREATED);
-// }
-//
-// @PutMapping
-// @Log("修改卖家端订单消息通知")
-// @ApiOperation("修改卖家端订单消息通知")
-// @PreAuthorize("@el.check('messageOrderSeller:edit')")
-// public ResponseEntity<Object> updateMessageOrderSeller(@Validated @RequestBody MessageOrderSeller resources){
-// messageOrderSellerService.update(resources);
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-// }
-//
-// @DeleteMapping
-// @Log("删除卖家端订单消息通知")
-// @ApiOperation("删除卖家端订单消息通知")
-// @PreAuthorize("@el.check('messageOrderSeller:del')")
-// public ResponseEntity<Object> deleteMessageOrderSeller(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
-// messageOrderSellerService.deleteAll(ids);
-// return new ResponseEntity<>(HttpStatus.OK);
-// }
-
-// //订单状态变化通知
-// @GetMapping("/status/{order_id}")
-// @ApiOperation("查询一条订单状态变化通知")
-// public R<String> getMessageOrderSeller(@PathVariable Integer order_id) {
-// MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
-// String message = messageOrderSeller.getMessageType();
-//
-//// return new ResponseEntity<>(message, HttpStatus.OK);
-// return R.success(message);
-// }
- //根据store_id 返回list订单状态变化通知
- @GetMapping("/status/store/{store_id}")
- @ApiOperation("根据store_id 返回list订单状态变化通知")
- public R<List<MessageOrderSellerDTO>> getMessageOrderSeller(@PathVariable String store_id) {
- List<MessageOrderSeller> messageOrderSeller = messageOrderSellerService.findByStoreId(store_id);
- //转换为MessageOrderSellerDTO huto tools
- List<MessageOrderSellerDTO> dtoList = BeanUtil.copyToList(messageOrderSeller, MessageOrderSellerDTO.class);
- //判断store_id存在
- if (messageOrderSeller == null) {
- return R.fail("store_id不存在");
- }else{return R.success(dtoList);}
-
- }
- //让前端标记已读
- //修改逻辑 主键为条件 而不是订单号，有些订单号可能重复 含多条信息 已弃用
-// @PostMapping("/readByorderid/{order_id}")
-// @ApiOperation("让前端标记已读 按条")
-// public R<String> getMessageOrderSellerRead(@PathVariable Integer order_id) {
-// if(messageOrderSellerService.updateMessageOrderSellerRead(order_id)){
-// return R.success("已读");
-// }else{
-// return R.fail("id不存在");
-// }
-// }
- //让前端标记已读 主键为条件
- @PostMapping("/read/{id}")
- @ApiOperation("标记单条消息为已读（按主键 id）")
- public R<String> markReadByPrimaryKey(@PathVariable Integer id) {
- boolean updated = messageOrderSellerService.updateReadStatusById(id);
- return updated ? R.success("已读") : R.fail("消息 id 不存在");
- }
- @Beta//重复值处理
- //让后端队友更新我的表
- @PostMapping("/update/seller")
- @ApiOperation("更新插入消息表")
- public R<String> updateMessageOrderSeller(@RequestBody MessageOrderSeller resources) {
- //插入一条数据
- if(messageOrderSellerService.saveMessageOrderSellerByOrderIdAndStoreId(resources))
- return R.success("更新成功");
- return R.fail("更新失败");
-
- }
-
-
-
-
-
-
- //订单送达通知
- @GetMapping("/deliver/{order_id}")
- @ApiOperation("查询一条订单送达通知")
- public R<String> getMessageOrderSellerDeliver(@PathVariable Integer order_id) {
- MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
- String message = messageOrderSeller.getMessageType();
- //如果MessageType为订单送达，则返回message——content
- if (message.equals("买家下单")) {
- String messageContent = messageOrderSeller.getMessageContent();
-// return new ResponseEntity<>(messageContent, HttpStatus.OK);
- return R.success(messageContent);
- }else{
- //返回没送达
-// return new ResponseEntity<>("买家没下单", HttpStatus.OK);
- return R.fail("没送达");
- }
- }
- //实现点击跳转到订单详情
- @GetMapping("/link/{order_id}")
- @ApiOperation("点击跳转到订单详情")
- public R<String> getMessageOrderSellerLink(@PathVariable Integer order_id) {
- MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
- String link = messageOrderSeller.getLink();
-// return new ResponseEntity<>(link, HttpStatus.OK);
- return R.success(link);
- }
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemAdvertiseController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemAdvertiseController.java
deleted file mode 100644
index 2734ce5..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemAdvertiseController.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageSystemAdvertise;
-import com.oying.modules.message.service.MessageSystemAdvertiseService;
-import com.oying.modules.message.domain.dto.MessageSystemAdvertiseQueryCriteria;
-import com.oying.utils.R;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
-
-/**
-* @author leomon
-* @date 2025-06-05
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "广告")
-@RequestMapping("/api/messageSystemAdvertise")
-public class MessageSystemAdvertiseController {
-
- private final MessageSystemAdvertiseService messageSystemAdvertiseService;
-
-
- @GetMapping
- @ApiOperation("页查询广告")
- @PreAuthorize("@el.check('messageSystemAdvertise:list')")
- public R<PageResult<MessageSystemAdvertise>> queryMessageSystemAdvertise(MessageSystemAdvertiseQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-// return new ResponseEntity<>(messageSystemAdvertiseService.queryAll(criteria,page),HttpStatus.OK);
- return R.success(messageSystemAdvertiseService.queryAll(criteria,page));
-
- }
- //条查询广告
- @GetMapping("/{id}")
- @ApiOperation("条查询广告")
- public R<MessageSystemAdvertise> getMessageSystemAdvertise(@PathVariable Integer id){
- MessageSystemAdvertise messageSystemAdvertise = messageSystemAdvertiseService.getById(id);
-// return new ResponseEntity<>(messageSystemAdvertise,HttpStatus.OK);
- return R.success(messageSystemAdvertise);
- }
-
-// @PostMapping
-// @Log("新增广告")
-// @ApiOperation("新增广告")
-// @PreAuthorize("@el.check('messageSystemAdvertise:add')")
-// public ResponseEntity<Object> createMessageSystemAdvertise(@Validated @RequestBody MessageSystemAdvertise resources){
-// messageSystemAdvertiseService.create(resources);
-// return new ResponseEntity<>(HttpStatus.CREATED);
-// }
-
-// @PutMapping
-// @Log("修改广告")
-// @ApiOperation("修改广告")
-// @PreAuthorize("@el.check('messageSystemAdvertise:edit')")
-// public ResponseEntity<Object> updateMessageSystemAdvertise(@Validated @RequestBody MessageSystemAdvertise resources){
-// messageSystemAdvertiseService.update(resources);
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-// }
-
-// @DeleteMapping
-// @Log("删除广告")
-// @ApiOperation("删除广告")
-// @PreAuthorize("@el.check('messageSystemAdvertise:del')")
-// public ResponseEntity<Object> deleteMessageSystemAdvertise(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
-// messageSystemAdvertiseService.deleteAll(ids);
-// return new ResponseEntity<>(HttpStatus.OK);
-// }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java
deleted file mode 100644
index 4ce11f6..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageSystem;
-import com.oying.modules.message.domain.dto.SendMessageRequestDto;
-import com.oying.modules.message.service.MessageSystemService;
-import com.oying.modules.message.domain.dto.MessageSystemQueryCriteria;
-import com.oying.modules.system.domain.User;
-import com.oying.modules.system.domain.UserSubscribe;
-import com.oying.utils.HttpRequest;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
-import com.oying.modules.security.service.WeiXinService;
-import com.oying.utils.R;
-/**
- * @author 李萌
- * @date 2025-05-20
- **/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "消息_系统")
-@RequestMapping("/api/message/messageSystem")
-public class MessageSystemController {
-
- private static final Logger log = LoggerFactory.getLogger(MessageSystemController.class);
- private final MessageSystemService messageSystemService;
- private final WeiXinService weiXinService;
-
-
-
-// @ApiOperation("导出数据")
-// @GetMapping(value = "/download")
-// @PreAuthorize("@el.check('messageSystem:list')")
-// public void exportMessageSystem(HttpServletResponse response, MessageSystemQueryCriteria criteria) throws IOException {
-// messageSystemService.download(messageSystemService.queryAll(criteria), response);
-// }
-
- @GetMapping
- @ApiOperation("查询消息_系统")
- @PreAuthorize("@el.check('messageSystem:list')")
- public R<PageResult<MessageSystem>> queryMessageSystem(MessageSystemQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-// return new ResponseEntity<>(messageSystemService.queryAll(criteria,page),HttpStatus.OK);
- return R.success(messageSystemService.queryAll(criteria,page));
- }
-
-// @PostMapping
-// @Log("新增消息_系统")
-// @ApiOperation("新增消息_系统")
-// @PreAuthorize("@el.check('messageSystem:add')")
-// public ResponseEntity<Object> createMessageSystem(@Validated @RequestBody MessageSystem resources){
-// messageSystemService.create(resources);
-// return new ResponseEntity<>(HttpStatus.CREATED);
-// }
-
-// @PutMapping
-// @Log("修改消息_系统")
-// @ApiOperation("修改消息_系统")
-// @PreAuthorize("@el.check('messageSystem:edit')")
-// public ResponseEntity<Object> updateMessageSystem(@Validated @RequestBody MessageSystem resources){
-// messageSystemService.update(resources);
-// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-// }
-
-// @DeleteMapping
-// @Log("删除消息_系统")
-// @ApiOperation("删除消息_系统")
-// @PreAuthorize("@el.check('messageSystem:del')")
-// public ResponseEntity<Object> deleteMessageSystem(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
-// messageSystemService.deleteAll(ids);
-// return new ResponseEntity<>(HttpStatus.OK);
-// }
-
- //查询一条系统消息
- @GetMapping("/{id}")
- @ApiOperation("查询一条系统消息")
- public R<MessageSystem> getMessageSystem(@PathVariable Integer id){
- MessageSystem messageSystem = messageSystemService.getById(id);
-// return new ResponseEntity<>(messageSystem,HttpStatus.OK);
- return R.success(messageSystem);
- }
- //插入一条系统消息 带两个参数start与end
- @PostMapping()
- @ApiOperation("插入一条系统消息")
- public R<Object> insertMessageSystem(
- @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date start,
- @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
-
- // 创建 MessageSystem 对象
- MessageSystem messageSystem = new MessageSystem();
- messageSystem.setStartTime(new Timestamp(start.getTime()));
- messageSystem.setEndTime(new Timestamp(end.getTime()));
-
- // 调用服务层保存数据
- messageSystemService.save(messageSystem);
-
-// return new ResponseEntity<>(HttpStatus.OK);
- return R.success("插入成功");
- }
-
- /**
- * POST 该接口用于发送订阅消息。
- * data 请求参数
- * openid 用户openId
- * templateId 订阅模板id
- * page 小程序跳转链接
- */
-// public void sendMessage(Map<String, Object> data, String openid, String templateId, String page) {
-// JSONObject jsonObject = new JSONObject();
-// if (wxEnabled) {
-// String url = weiXinProperties.getSendMessage();
-// url = url.replace("{accessToken}", getStableAccessToken());
-// Map<String, Object> map = getSendMessageDto(data, openid, templateId, page);
-// jsonObject = HttpRequest.exchangeJsonObject(HttpMethod.POST, url, map);
-// } else {
-// jsonObject.put("message", "测试环境");
-// }
-// User user = userService.findByOpenid(openid);
-// UserSubscribe sub = new UserSubscribe();
-// sub.setSubType(templateId);
-// sub.setUserId(user.getId());
-// sub.setOpenid(openid);
-// sub.setUsername(user.getUsername());
-// sub.setSendMessage(JSONObject.toJSONString(data));
-// sub.setSubMessage(jsonObject.toJSONString());
-// subscribeService.save(sub);
-// }
- //调用微信发送消息接口sendMessage
-
- //示例
-// {
-// "touser": "OPENID",
-// "template_id": "TEMPLATE_ID",
-// "page": "index",
-// "data":{
-// "phrase3": {
-// "value": "审核通过"
-// },
-// "name1": {
-// "value": "订阅"
-// },
-// "date2": {
-// "value": "2019-12-25 09:42"
-// }
-// }
-// }
-//todo 发送订阅消息 数据库暂未存储
- @PostMapping("/sendMessage")
- @ApiOperation("发送订阅消息")
- public R<SendMessageRequestDto> sendMessage(@RequestBody SendMessageRequestDto request){
- //打印request
- //SendMessageRequestDto(touser=OPENID, template_id=TEMPLATE_ID, page=index, data={date2={"value":"2019-12-25 09:42"}, phrase3={"value":"审核通过"}, name1={"value":"订阅"}})
- log.info("request:{}", request);
- try {
- weiXinService.sendMessage(request.getData(), request.getTouser(), request.getTemplate_id(), request.getPage());
- return R.success(request);
- } catch (Exception e) {
- // 如果捕获到异常，返回错误信息
- log.error("发送订阅消息失败", e);
- return R.fail(request,"发送订阅消息失败 用真实数据：" + e.getMessage());
- }
- }
-
-
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MesCustomerCommentMsgService.java b/oying-system/src/main/java/com/oying/modules/message/service/MesCustomerCommentMsgService.java
index ea76e69..917267a 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/MesCustomerCommentMsgService.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/MesCustomerCommentMsgService.java
@@ -1,63 +1,80 @@
package com.oying.modules.message.service;
-import com.oying.modules.message.domain.MesCustomerCommentMsg;
-import com.oying.modules.message.domain.dto.MesCustomerCommentMsgQueryCriteria;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.oying.modules.message.domain.MesCustomerCommentMsg;
+import com.oying.modules.message.domain.dto.MesCustomerCommentMsgQueryCriteria;
import com.oying.modules.message.domain.myDto.MesCustomerCommentMsgDTO;
import com.oying.utils.PageResult;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @description 服务接口
+ * @date 2025-07-25
+ **/
public interface MesCustomerCommentMsgService extends IService<MesCustomerCommentMsg> {
/**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
+ * 查询数据分页
+ *
+ * @param criteria 条件
+ * @param page 分页参数
+ * @return PageResult
+ */
PageResult<MesCustomerCommentMsg> queryAll(MesCustomerCommentMsgQueryCriteria criteria, Page<Object> page);
/**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MesCustomerCommentMsgDto>
- */
+ * 查询所有数据不分页
+ *
+ * @param criteria 条件参数
+ * @return List<MesCustomerCommentMsgDto>
+ */
List<MesCustomerCommentMsg> queryAll(MesCustomerCommentMsgQueryCriteria criteria);
/**
- * 创建
- * @param resources /
- */
+ * 创建
+ *
+ * @param resources /
+ */
void create(MesCustomerCommentMsg resources);
/**
- * 编辑
- * @param resources /
- */
+ * 编辑
+ *
+ * @param resources /
+ */
void update(MesCustomerCommentMsg resources);
/**
- * 多选删除
- * @param ids /
- */
+ * 多选删除
+ *
+ * @param ids /
+ */
void deleteAll(List<Long> ids);
/**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
+ * 导出数据
+ *
+ * @param all 待导出的数据
+ * @param response /
+ * @throws IOException /
+ */
void download(List<MesCustomerCommentMsg> all, HttpServletResponse response) throws IOException;
List<MesCustomerCommentMsgDTO> listCustomerComment(Long shopId);
+
+ //方法插入相应的数据
+ //一个店铺下多个订单 。 每个订单每个顾客留言
+ //插入参数 订单编号 留言内容 店铺ID
+ // 插入id, msg_record_id, shop_id, order_id, order_no, buyer_id, buyer_name, evaluation_id, replied, create_by, create_time, update_by, update_time, comment_time, comment_content, reply_content, ext_jump_url, int_jump_path
+
+ void insertOrderMsg(MesCustomerCommentMsg resources);
+
+ //插入具体字段 店铺id 订单编号 订单id 买家id 买家姓名 留言内容 回复内容
+ void insertOrderMsgDetail(Long shopId, Long orderId, String orderNo, String buyerId, String buyerName, String commentContent, String replyContent);
+
}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java b/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java
index eecc38e..5355816 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java
@@ -1,70 +1,76 @@
package com.oying.modules.message.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.message.common.OrderStatusEnum;
import com.oying.modules.message.domain.MesMsgRecord;
import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryPollDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQuerySystemDto;
import com.oying.utils.PageResult;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @description 服务接口
+ * @date 2025-07-25
+ **/
public interface MesMsgRecordService extends IService<MesMsgRecord> {
/**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
+ * 查询数据分页
+ *
+ * @param criteria 条件
+ * @param page 分页参数
+ * @return PageResult
+ */
PageResult<MesMsgRecord> queryAll(MesMsgRecordQueryCriteria criteria, Page<Object> page);
/**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MesMsgRecordDto>
- */
+ * 查询所有数据不分页
+ *
+ * @param criteria 条件参数
+ * @return List<MesMsgRecordDto>
+ */
List<MesMsgRecord> queryAll(MesMsgRecordQueryCriteria criteria);
/**
- * 创建
- * @param resources /
- */
+ * 创建
+ *
+ * @param resources /
+ */
void create(MesMsgRecord resources);
/**
- * 编辑
- * @param resources /
- */
+ * 编辑
+ *
+ * @param resources /
+ */
void update(MesMsgRecord resources);
/**
- * 多选删除
- * @param ids /
- */
+ * 多选删除
+ *
+ * @param ids /
+ */
void deleteAll(List<Long> ids);
/**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
+ * 导出数据
+ *
+ * @param all 待导出的数据
+ * @param response /
+ * @throws IOException /
+ */
void download(List<MesMsgRecord> all, HttpServletResponse response) throws IOException;
- List<MesMsgRecordQueryPollDto> PollMes(Long platform);
+ List<MesMsgRecordQueryPollDto> PollMes(Long platform, Long mestype);
- void batchMarkRead(Long platform,List<Long> msgIds);
+ void batchMarkRead(Long platform, List<Long> msgIds);
PageResult<MesMsgRecordQuerySystemDto> queryAllSysNotice(MesMsgRecordQueryCriteria criteria, Page<Object> page);
@@ -75,4 +81,5 @@
// 入参 订单编号 订单状态（内容） 店铺id
void insertOrderMsg(String orderNo, OrderStatusEnum content, Long shopId);
+ List<MesMsgRecordQueryPollDto> PollMesAll(Long platform);
}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderBuyerService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderBuyerService.java
deleted file mode 100644
index 788bef2..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderBuyerService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageOrderBuyer;
-import com.oying.modules.message.domain.MessageOrderLeave;
-import com.oying.modules.message.domain.dto.MessageOrderBuyerQueryCriteria;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-05-20
-**/
-public interface MessageOrderBuyerService extends IService<MessageOrderBuyer> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageOrderBuyer> queryAll(MessageOrderBuyerQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageOrderBuyerDto>
- */
- List<MessageOrderBuyer> queryAll(MessageOrderBuyerQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageOrderBuyer resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageOrderBuyer resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Integer> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageOrderBuyer> all, HttpServletResponse response) throws IOException;
-
- public MessageOrderBuyer findByOrderId(Integer orderId) ;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderLeaveService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderLeaveService.java
deleted file mode 100644
index f20e46e..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderLeaveService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.oying.modules.message.domain.MessageOrderLeave;
-import com.oying.modules.message.domain.dto.MessageOrderLeaveQueryCriteria;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-05-20
-**/
-public interface MessageOrderLeaveService extends IService<MessageOrderLeave> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageOrderLeave> queryAll(MessageOrderLeaveQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageOrderLeaveDto>
- */
- List<MessageOrderLeave> queryAll(MessageOrderLeaveQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageOrderLeave resources);
-
- /**
- * 编辑
- * @param resources /
- */
-// void update(MessageOrderLeave resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Integer> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageOrderLeave> all, HttpServletResponse response) throws IOException;
-
- /**
- * 根据订单ID查找留言信息
- * @param orderId 订单ID
- * @return 匹配的留言记录，若不存在则返回 null
- */
- public MessageOrderLeave findByOrderId(Integer orderId) ;
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderSellerService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderSellerService.java
deleted file mode 100644
index db8686c..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderSellerService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.google.common.annotations.Beta;
-import com.oying.modules.message.domain.MessageOrderSeller;
-import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-05-20
-**/
-public interface MessageOrderSellerService extends IService<MessageOrderSeller> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageOrderSeller> queryAll(MessageOrderSellerQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageOrderSellerDto>
- */
- List<MessageOrderSeller> queryAll(MessageOrderSellerQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageOrderSeller resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageOrderSeller resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Integer> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageOrderSeller> all, HttpServletResponse response) throws IOException;
- public MessageOrderSeller findByOrderId(Integer orderId) ;
-
- List<MessageOrderSeller> findByStoreId(String storeId);
-
- boolean updateMessageOrderSellerRead(Integer orderId);
-
- /**
- * 保存或更新 MessageOrderSeller 记录。
- * <p>
- * 该方法根据传入的 MessageOrderSeller 对象，将数据插入到数据库中。
- * 如果记录已存在，则更新；如果不存在，则插入新记录。
- * </p>
- * <p>
- * 必须字段：
- * - orderId：订单 ID
- * - storeId：店铺 ID
- * </p>
- * <p>
- * 可选字段：
- * - messageType：消息类型 ： 暂未使用
- * - messageContent：消息内容 ： "订单已提交" :"支付成功" 商家已接单 骑手已接单" 即com.oying.modules.message.common.OrderStatusEnum
- * - link：链接
- * - flag：标志字段（默认值为未读 0）
- * </p>
- *
- * @param resources MessageOrderSeller 对象，包含需要保存或更新的数据。
- * @return true 表示保存成功，false 表示保存失败。
- */
- @Beta
- boolean saveMessageOrderSellerByOrderIdAndStoreId(MessageOrderSeller resources);
-
- boolean updateReadStatusById(Integer id);
-
-// public void saveMessage(MessageOrderSeller resources) ;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageSystemAdvertiseService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageSystemAdvertiseService.java
deleted file mode 100644
index 2fde73e..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageSystemAdvertiseService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageSystemAdvertise;
-import com.oying.modules.message.domain.dto.MessageSystemAdvertiseQueryCriteria;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务接口
-* @author leomon
-* @date 2025-06-05
-**/
-public interface MessageSystemAdvertiseService extends IService<MessageSystemAdvertise> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageSystemAdvertise> queryAll(MessageSystemAdvertiseQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageSystemAdvertiseDto>
- */
- List<MessageSystemAdvertise> queryAll(MessageSystemAdvertiseQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageSystemAdvertise resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageSystemAdvertise resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageSystemAdvertise> all, HttpServletResponse response) throws IOException;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageSystemService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageSystemService.java
deleted file mode 100644
index 38c4ccb..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageSystemService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageSystem;
-import com.oying.modules.message.domain.dto.MessageSystemQueryCriteria;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.oying.utils.PageResult;
-
-/**
- * @description 服务接口
- * @author 李萌
- * @date 2025-05-20
- **/
-public interface MessageSystemService extends IService<MessageSystem> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageSystem> queryAll(MessageSystemQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageSystemDto>
- */
- List<MessageSystem> queryAll(MessageSystemQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageSystem resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageSystem resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Integer> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageSystem> all, HttpServletResponse response) throws IOException;
-
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesCustomerCommentMsgServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesCustomerCommentMsgServiceImpl.java
index 3683651..544f848 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesCustomerCommentMsgServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesCustomerCommentMsgServiceImpl.java
@@ -1,29 +1,32 @@
package com.oying.modules.message.service.impl;
-import com.oying.modules.message.domain.MesCustomerCommentMsg;
-import com.oying.modules.message.domain.myDto.MesCustomerCommentMsgDTO;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MesCustomerCommentMsgService;
+import com.oying.modules.message.domain.MesCustomerCommentMsg;
import com.oying.modules.message.domain.dto.MesCustomerCommentMsgQueryCriteria;
+import com.oying.modules.message.domain.myDto.MesCustomerCommentMsgDTO;
import com.oying.modules.message.mapper.MesCustomerCommentMsgMapper;
+import com.oying.modules.message.service.MesCustomerCommentMsgService;
+import com.oying.utils.FileUtil;
+import com.oying.utils.PageResult;
+import com.oying.utils.PageUtil;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-import java.util.*;
-import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-
-import com.oying.utils.PageResult;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
/**
-* @description 服务实现
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @description 服务实现
+ * @date 2025-07-25
+ **/
@Service
@RequiredArgsConstructor
public class MesCustomerCommentMsgServiceImpl extends ServiceImpl<MesCustomerCommentMsgMapper, MesCustomerCommentMsg> implements MesCustomerCommentMsgService {
@@ -31,12 +34,12 @@
private final MesCustomerCommentMsgMapper mesCustomerCommentMsgMapper;
@Override
- public PageResult<MesCustomerCommentMsg> queryAll(MesCustomerCommentMsgQueryCriteria criteria, Page<Object> page){
+ public PageResult<MesCustomerCommentMsg> queryAll(MesCustomerCommentMsgQueryCriteria criteria, Page<Object> page) {
return PageUtil.toPage(mesCustomerCommentMsgMapper.findAll(criteria, page));
}
@Override
- public List<MesCustomerCommentMsg> queryAll(MesCustomerCommentMsgQueryCriteria criteria){
+ public List<MesCustomerCommentMsg> queryAll(MesCustomerCommentMsgQueryCriteria criteria) {
return mesCustomerCommentMsgMapper.findAll(criteria);
}
@@ -86,4 +89,78 @@
public List<MesCustomerCommentMsgDTO> listCustomerComment(Long shopId) {
return mesCustomerCommentMsgMapper.listCustomerComment(shopId);
}
+
+
+ //订单消息 插入对应字段
+
+ @Override
+ public void insertOrderMsg(MesCustomerCommentMsg resources) {
+ //先临时对象
+ MesCustomerCommentMsg mesCustomerCommentMsg = new MesCustomerCommentMsg();
+ //对象属性非空则插入
+ if (resources.getMsgRecordId() != null) {
+ mesCustomerCommentMsg.setMsgRecordId(resources.getMsgRecordId());
+ }
+ if (resources.getShopId() != null) {
+ mesCustomerCommentMsg.setShopId(resources.getShopId());
+ }
+ if (resources.getOrderId() != null) {
+ mesCustomerCommentMsg.setOrderId(resources.getOrderId());
+ }
+ if (resources.getOrderNo() != null) {
+ mesCustomerCommentMsg.setOrderNo(resources.getOrderNo());
+ }
+ if (resources.getBuyerId() != null) {
+ mesCustomerCommentMsg.setBuyerId(resources.getBuyerId());
+ }
+ if (resources.getBuyerName() != null) {
+ mesCustomerCommentMsg.setBuyerName(resources.getBuyerName());
+ }
+
+
+ }
+
+ @Override
+ public void insertOrderMsgDetail(Long shopId, Long orderId, String orderNo, String buyerId, String buyerName, String commentContent, String replyContent) {
+ // 插入具体字段 店铺id 订单编号 订单id 买家id 买家姓名 留言内容 回复内容
+ // 先临时对象
+ MesCustomerCommentMsg mesCustomerCommentMsg = new MesCustomerCommentMsg();
+
+ // 设置对象属性 非空则插入 注意要有异常判断
+ if (shopId != null) {
+ mesCustomerCommentMsg.setShopId(shopId);
+ }
+ if (orderId != null) {
+ mesCustomerCommentMsg.setOrderId(orderId);
+ }
+ if (orderNo != null) {
+ mesCustomerCommentMsg.setOrderNo(orderNo);
+ }
+ if (buyerId != null) {
+ mesCustomerCommentMsg.setBuyerId(buyerId);
+ }
+ if (buyerName != null) {
+ mesCustomerCommentMsg.setBuyerName(buyerName);
+ }
+ if (commentContent != null) {
+ mesCustomerCommentMsg.setCommentContent(commentContent);
+ }
+ if (replyContent != null) {
+ mesCustomerCommentMsg.setReplyContent(replyContent);
+ // 如果有回复内容，则标记为已回复
+ mesCustomerCommentMsg.setReplied(1);
+ } else {
+ // 如果没有回复内容，则标记为未回复
+ mesCustomerCommentMsg.setReplied(0);
+ }
+
+ // 设置创建时间
+// 设置创建时间 - 使用 Timestamp 的标准写法
+ mesCustomerCommentMsg.setCreateTime(new Timestamp(System.currentTimeMillis()));
+
+
+ // 插入数据
+ mesCustomerCommentMsgMapper.insert(mesCustomerCommentMsg);
+ }
+
}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
index 95d4514..0f6416b 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
@@ -1,30 +1,31 @@
package com.oying.modules.message.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.oying.modules.message.common.MesReadEnum;
import com.oying.modules.message.common.MesTypeEnum;
import com.oying.modules.message.common.OrderStatusEnum;
import com.oying.modules.message.domain.MesMsgRecord;
+import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryPollDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQuerySystemDto;
-import com.oying.utils.FileUtil;
-import com.oying.utils.SecurityUtils;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MesMsgRecordService;
-import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
import com.oying.modules.message.mapper.MesMsgRecordMapper;
+import com.oying.modules.message.service.MesMsgRecordService;
+import com.oying.utils.FileUtil;
+import com.oying.utils.PageResult;
+import com.oying.utils.PageUtil;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-import java.sql.Timestamp;
-import java.util.*;
-import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-
-import com.oying.utils.PageResult;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author 李萌
@@ -93,8 +94,8 @@
}
@Override
- public List<MesMsgRecordQueryPollDto> PollMes(Long platform) {
- return mesMsgRecordMapper.PollMes(platform);
+ public List<MesMsgRecordQueryPollDto> PollMes(Long platform, Long mestype) {
+ return mesMsgRecordMapper.PollMes(platform, mestype);
}
@Override
@@ -125,8 +126,13 @@
try {
mesMsgRecordMapper.insert(record);
} catch (Exception e) {
- log.error("插入订单消息失败：{}", e);
+ log.error("插入订单消息失败：{}", e);
}
}
+
+ @Override
+ public List<MesMsgRecordQueryPollDto> PollMesAll(Long platform) {
+ return mesMsgRecordMapper.PollMesAll(platform);
+ }
}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.java
deleted file mode 100644
index 212e818..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.oying.modules.message.domain.MessageOrderBuyer;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MessageOrderBuyerService;
-import com.oying.modules.message.domain.dto.MessageOrderBuyerQueryCriteria;
-import com.oying.modules.message.mapper.MessageOrderBuyerMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务实现
-* @author 李萌
-* @date 2025-05-20
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageOrderBuyerServiceImpl extends ServiceImpl<MessageOrderBuyerMapper, MessageOrderBuyer> implements MessageOrderBuyerService {
-
- private final MessageOrderBuyerMapper messageOrderBuyerMapper;
-
- @Override
- public PageResult<MessageOrderBuyer> queryAll(MessageOrderBuyerQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageOrderBuyerMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageOrderBuyer> queryAll(MessageOrderBuyerQueryCriteria criteria){
- return messageOrderBuyerMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageOrderBuyer resources) {
- messageOrderBuyerMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageOrderBuyer resources) {
- MessageOrderBuyer messageOrderBuyer = getById(resources.getId());
- messageOrderBuyer.copy(resources);
- messageOrderBuyerMapper.updateById(messageOrderBuyer);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Integer> ids) {
- messageOrderBuyerMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageOrderBuyer> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageOrderBuyer messageOrderBuyer : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("订单ID", messageOrderBuyer.getOrderId());
- map.put("消息类型（订单状态变化、订单送达）", messageOrderBuyer.getMessageType());
- map.put("消息内容", messageOrderBuyer.getMessageContent());
- map.put("跳转链接", messageOrderBuyer.getLink());
- map.put("创建时间", messageOrderBuyer.getCreateTime());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-
- @Override
- public MessageOrderBuyer findByOrderId(Integer orderId) {
- return baseMapper.selectOne(new QueryWrapper<MessageOrderBuyer>().eq("order_id", orderId));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java
deleted file mode 100644
index 9d28813..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.oying.modules.message.domain.MessageOrderLeave;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MessageOrderLeaveService;
-import com.oying.modules.message.domain.dto.MessageOrderLeaveQueryCriteria;
-import com.oying.modules.message.mapper.MessageOrderLeaveMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务实现
-* @author 李萌
-* @date 2025-05-20
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageOrderLeaveServiceImpl extends ServiceImpl<MessageOrderLeaveMapper, MessageOrderLeave> implements MessageOrderLeaveService {
-
- private final MessageOrderLeaveMapper messageOrderLeaveMapper;
-
- @Override
- public PageResult<MessageOrderLeave> queryAll(MessageOrderLeaveQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageOrderLeaveMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageOrderLeave> queryAll(MessageOrderLeaveQueryCriteria criteria){
- return messageOrderLeaveMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageOrderLeave resources) {
- messageOrderLeaveMapper.insert(resources);
- }
-
-// @Override
-// @Transactional(rollbackFor = Exception.class)
-// public void update(MessageOrderLeave resources) {
-// MessageOrderLeave messageOrderLeave = getById(resources.getId());
-// messageOrderLeave.copy(resources);
-// messageOrderLeaveMapper.updateById(messageOrderLeave);
-// }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Integer> ids) {
- messageOrderLeaveMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageOrderLeave> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageOrderLeave messageOrderLeave : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("订单ID", messageOrderLeave.getOrderId());
- map.put("顾客评价内容", messageOrderLeave.getCustomerReview());
- map.put("商家回复内容", messageOrderLeave.getSellerReply());
- map.put("跳转链接", messageOrderLeave.getLink());
- map.put("创建时间", messageOrderLeave.getCreateTime());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-
- /**
- * 根据订单ID查找留言信息
- * @param orderId 订单ID
- * @return 匹配的留言记录，若不存在则返回 null
- */
- public MessageOrderLeave findByOrderId(Integer orderId) {
- return baseMapper.selectOne(new QueryWrapper<MessageOrderLeave>()
- .eq("order_id", orderId));
- }
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.java
deleted file mode 100644
index a248ec6..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.oying.modules.message.domain.MessageOrderSeller;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MessageOrderSellerService;
-import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
-import com.oying.modules.message.mapper.MessageOrderSellerMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.util.Beta;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-
-import java.util.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务实现
-* @author 李萌
-* @date 2025-05-20
-**/
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class MessageOrderSellerServiceImpl extends ServiceImpl<MessageOrderSellerMapper, MessageOrderSeller> implements MessageOrderSellerService {
-
- private final MessageOrderSellerMapper messageOrderSellerMapper;
-
-
-
-
- @Override
- public PageResult<MessageOrderSeller> queryAll(MessageOrderSellerQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageOrderSellerMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageOrderSeller> queryAll(MessageOrderSellerQueryCriteria criteria){
- return messageOrderSellerMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageOrderSeller resources) {
- messageOrderSellerMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageOrderSeller resources) {
- MessageOrderSeller messageOrderSeller = getById(resources.getId());
- messageOrderSeller.copy(resources);
- messageOrderSellerMapper.updateById(messageOrderSeller);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Integer> ids) {
- messageOrderSellerMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageOrderSeller> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageOrderSeller messageOrderSeller : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put(" orderId", messageOrderSeller.getOrderId());
- map.put(" messageType", messageOrderSeller.getMessageType());
- map.put(" messageContent", messageOrderSeller.getMessageContent());
- map.put(" link", messageOrderSeller.getLink());
- map.put(" createTime", messageOrderSeller.getCreateTime());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-
- @Override
- public MessageOrderSeller findByOrderId(Integer orderId) {
- return baseMapper.selectOne(new QueryWrapper<MessageOrderSeller>().eq("order_id", orderId));
- }
-
- @Override
- public List<MessageOrderSeller> findByStoreId(String storeId) {
- return messageOrderSellerMapper.findByStoreId(storeId);
- }
-
- @Override
- public boolean updateMessageOrderSellerRead(Integer orderId) {
- return messageOrderSellerMapper.updateMessageOrderSellerRead(orderId);
- }
-
- /**
- * 保存或更新 MessageOrderSeller 记录。
- * <p>
- * 该方法根据传入的 MessageOrderSeller 对象，将数据插入到数据库中。
- * 如果记录已存在，则更新；如果不存在，则插入新记录。
- * </p>
- * <p>
- * 必须字段：
- * - orderId：订单 ID
- * - storeId：店铺 ID
- * </p>
- * <p>
- * 可选字段：
- * - messageType：消息类型 ： 暂时不用
- * - messageContent：消息内容 ： "订单已提交" :"支付成功" 商家已接单 骑手已接单".......com.oying.modules.message.common.OrderStatusEnum
- * - link：链接
- * - flag：标志字段（默认值为未读 0）
- * </p>
- *
- * @param resources MessageOrderSeller 对象，包含需要保存或更新的数据。
- * @return true 表示保存成功，false 表示保存失败。
- *
- * 目前插入orderId storeId messageContent即可，其他保留---------
- */
- @Override
- public boolean saveMessageOrderSellerByOrderIdAndStoreId(MessageOrderSeller resources) {
-
- try {
- // 1. 判断重复的记录是否存在
-// // messageType此处不用
- long count = this.lambdaQuery()
- .eq(MessageOrderSeller::getOrderId, resources.getOrderId())
- .eq(MessageOrderSeller::getStoreId, resources.getStoreId())
- .eq(MessageOrderSeller::getMessageContent, resources.getMessageContent())
- .eq(MessageOrderSeller::getFlag, 0) // 未读
- .count();
-
- //存在 不插入
- if (count > 0) {
- log.warn("消息已存在，跳过保存:{}",
- resources);
- return false;
- }else{
- return messageOrderSellerMapper.saveMessageOrderSellerByOrderIdAndStoreId(resources);
- }
-
- } catch (Exception e) {
- log.error("保存消息异常",
- e);
- return false;
- }
-
- }
-
-
-
-
-
- @Override
- public boolean updateReadStatusById(Integer id) {
- return messageOrderSellerMapper.updateReadStatusById(id);
- }
-
-
-
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemAdvertiseServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemAdvertiseServiceImpl.java
deleted file mode 100644
index e298a07..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemAdvertiseServiceImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.oying.modules.message.domain.MessageSystemAdvertise;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MessageSystemAdvertiseService;
-import com.oying.modules.message.domain.dto.MessageSystemAdvertiseQueryCriteria;
-import com.oying.modules.message.mapper.MessageSystemAdvertiseMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import com.oying.utils.PageResult;
-
-/**
-* @description 服务实现
-* @author leomon
-* @date 2025-06-05
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageSystemAdvertiseServiceImpl extends ServiceImpl<MessageSystemAdvertiseMapper, MessageSystemAdvertise> implements MessageSystemAdvertiseService {
-
- private final MessageSystemAdvertiseMapper messageSystemAdvertiseMapper;
-
- @Override
- public PageResult<MessageSystemAdvertise> queryAll(MessageSystemAdvertiseQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageSystemAdvertiseMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageSystemAdvertise> queryAll(MessageSystemAdvertiseQueryCriteria criteria){
- return messageSystemAdvertiseMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageSystemAdvertise resources) {
- messageSystemAdvertiseMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageSystemAdvertise resources) {
- MessageSystemAdvertise messageSystemAdvertise = getById(resources.getId());
- messageSystemAdvertise.copy(resources);
- messageSystemAdvertiseMapper.updateById(messageSystemAdvertise);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
- messageSystemAdvertiseMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageSystemAdvertise> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageSystemAdvertise messageSystemAdvertise : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("广告标题", messageSystemAdvertise.getTitle());
- map.put("广告内容", messageSystemAdvertise.getContent());
- map.put("广告图片链接", messageSystemAdvertise.getImageUrl());
- map.put("广告跳转链接", messageSystemAdvertise.getLinkUrl());
- map.put("广告状态（0: 禁用；1: 启用）", messageSystemAdvertise.getStatus());
- map.put("创建人", messageSystemAdvertise.getCreateBy());
- map.put("更新人", messageSystemAdvertise.getUpdateBy());
- map.put("创建时间", messageSystemAdvertise.getCreateTime());
- map.put("更新时间", messageSystemAdvertise.getUpdateTime());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java
deleted file mode 100644
index 0fc9845..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.oying.modules.message.domain.MessageOrderLeave;
-import com.oying.modules.message.domain.MessageSystem;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MessageSystemService;
-import com.oying.modules.message.domain.dto.MessageSystemQueryCriteria;
-import com.oying.modules.message.mapper.MessageSystemMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-
-import java.util.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.oying.utils.PageResult;
-
-/**
- * @description 服务实现
- * @author 李萌
- * @date 2025-05-20
- **/
-@Service
-@RequiredArgsConstructor
-public class MessageSystemServiceImpl extends ServiceImpl<MessageSystemMapper, MessageSystem> implements MessageSystemService {
-
- private final MessageSystemMapper messageSystemMapper;
-
- @Override
- public PageResult<MessageSystem> queryAll(MessageSystemQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageSystemMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageSystem> queryAll(MessageSystemQueryCriteria criteria){
- return messageSystemMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageSystem resources) {
- messageSystemMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageSystem resources) {
- MessageSystem messageSystem = getById(resources.getId());
- messageSystem.copy(resources);
- messageSystemMapper.updateById(messageSystem);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Integer> ids) {
- messageSystemMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageSystem> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageSystem messageSystem : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("系统维护开始时间", messageSystem.getStartTime());
- map.put("系统维护截至时间", messageSystem.getEndTime());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-
-
-
-
-}
diff --git a/oying-system/src/main/resources/mapper/message/MesMsgRecordMapper.xml b/oying-system/src/main/resources/mapper/message/MesMsgRecordMapper.xml
index e204aaf..d1e1d60 100644
--- a/oying-system/src/main/resources/mapper/message/MesMsgRecordMapper.xml
+++ b/oying-system/src/main/resources/mapper/message/MesMsgRecordMapper.xml
@@ -41,18 +41,19 @@
</resultMap>
-
-
<sql id="Base_Column_List">
- id, template_id, receiver_id, platform, msg_type, title, content, biz_id, biz_type, is_read, read_time, extra, create_by, create_time, update_by, update_time
+ id
+ , template_id, receiver_id, platform, msg_type, title, content, biz_id, biz_type, is_read, read_time, extra, create_by, create_time, update_by, update_time
</sql>
<!-- 与 MesMsgRecordQueryPollDto 字段对应的 SQL 片段 -->
<sql id="Poll_Column_List">
- id, title, content
+ id
+ , title, content
</sql>
<!-- 与 MesMsgRecordQuerySystemDto 字段对应的 SQL 片段 -->
<sql id="System_Column_List">
- id, title, content
+ id
+ , title, content
</sql>
<update id="batchMarkRead">
UPDATE mes_msg_record
@@ -73,9 +74,49 @@
</where>
order by id desc
</select>
- <!-- 使用专门的 resultMap 进行映射 -->
- <select id="PollMes" parameterType="java.lang.Long" resultMap="PollResultMap">
- <!-- 根据平台 查询未读消息 -->
+ <!-- 使用Map作为参数类型，支持多参数传递 -->
+ <select id="PollMes" parameterType="map" resultMap="PollResultMap">
+ <!-- 根据平台和消息类型查询未读消息 -->
+ select
+ <include refid="Poll_Column_List"/>
+ from mes_msg_record
+ <where>
+ <if test="platform != null">
+ platform = #{platform}
+ </if>
+ <if test="msgType != null">
+ and msg_type = #{msgType}
+ </if>
+ and is_read = 0
+ </where>
+ order by id desc
+ </select>
+
+ <select id="queryAllSysNotice"
+ resultMap="SystemResultMap">
+ select
+ <include refid="System_Column_List"/>
+ from mes_msg_record
+ <where>
+ # 系统1
+ msg_type = 1
+ </where>
+ order by id desc
+ </select>
+ <select id="queryorder" resultType="com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto"
+ parameterType="java.lang.Long">
+ # 根据店铺号 给出订单号与订单消息
+ select id,content,order_no
+ from mes_msg_record
+ <where>
+ <if test="shopId != null">
+ shop_id = #{shopId}
+ </if>
+ </where>
+
+ </select>
+ <select id="PollMesAll" parameterType="long" resultMap="PollResultMap">
+ <!-- 根据平台和消息类型查询未读消息 -->
select
<include refid="Poll_Column_List"/>
from mes_msg_record
@@ -86,28 +127,5 @@
and is_read = 0
</where>
order by id desc
- </select>
- <select id="queryAllSysNotice"
- resultMap="SystemResultMap">
- select
- <include refid="System_Column_List"/>
- from mes_msg_record
- <where>
-# 系统1
- msg_type = 1
- </where>
- order by id desc
- </select>
- <select id="queryorder" resultType="com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto"
- parameterType="java.lang.Long">
-# 根据店铺号 给出订单号与订单消息
- select id,content,order_no
- from mes_msg_record
- <where>
- <if test="shopId != null">
- shop_id = #{shopId}
- </if>
- </where>
-
</select>
</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageOrderBuyerMapper.xml b/oying-system/src/main/resources/mapper/message/MessageOrderBuyerMapper.xml
deleted file mode 100644
index af70f58..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageOrderBuyerMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.oying.modules.message.mapper.MessageOrderBuyerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageOrderBuyer">
- <id column="id" property="id"/>
- <result column="order_id" property="orderId"/>
- <result column="message_type" property="messageType"/>
- <result column="message_content" property="messageContent"/>
- <result column="link" property="link"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="create_by" property="createBy"/>
- <result column="update_by" property="updateBy"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id, order_id, message_type, message_content, link, create_time, update_time, create_by, update_by
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_order_buyer
- <where>
- </where>
- order by id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageOrderLeaveMapper.xml b/oying-system/src/main/resources/mapper/message/MessageOrderLeaveMapper.xml
deleted file mode 100644
index b79908d..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageOrderLeaveMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.oying.modules.message.mapper.MessageOrderLeaveMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageOrderLeave">
- <id column="id" property="id"/>
- <result column="order_id" property="orderId"/>
- <result column="customer_review" property="customerReview"/>
- <result column="seller_reply" property="sellerReply"/>
- <result column="link" property="link"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="create_by" property="createBy"/>
- <result column="update_by" property="updateBy"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id, order_id, customer_review, seller_reply, link, create_time, update_time, create_by, update_by
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_order_leave
- <where>
- </where>
- order by id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml b/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml
deleted file mode 100644
index 3650877..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.oying.modules.message.mapper.MessageOrderSellerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageOrderSeller">
- <id column="id" property="id"/>
- <result column="order_id" property="orderId"/>
- <result column="store_id" property="storeId"/>
- <result column="message_type" property="messageType"/>
- <result column="message_content" property="messageContent"/>
- <result column="link" property="link"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="create_by" property="createBy"/>
- <result column="update_by" property="updateBy"/>
- <result column="flag" property="flag"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id, order_id,store_id, message_type, message_content, link, create_time, update_time, create_by, update_by,flag
- </sql>
-
- <insert id="saveMessageOrderSellerByOrderIdAndStoreId" parameterType="com.oying.modules.message.domain.MessageOrderSeller">
- # 动态sql 必须插入 order_id store_id 其他字段可以选择性插入 flag默认插入0
- <!-- 动态 SQL：必须插入 order_id 和 store_id -->
- <!-- 其他字段可以选择性插入 -->
- INSERT INTO message_order_seller (
- order_id,
- store_id,
- <if test="messageType != null">message_type,</if>
- <if test="messageContent != null">message_content,</if>
- <if test="link != null">link,</if>
- flag
- ) VALUES (
- #{orderId},
- #{storeId},
- <if test="messageType != null">#{messageType},</if>
- <if test="messageContent != null">#{messageContent},</if>
- <if test="link != null">#{link},</if>
- 0
- )
- </insert>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_order_seller
- <where>
- </where>
- order by id desc
- </select>
-
- <select id="findByStoreId" resultType="com.oying.modules.message.domain.MessageOrderSeller"
- parameterType="java.lang.String">
-# 根据store_id（不是主键）返回 list
- select
- <include refid="Base_Column_List"/>
- from message_order_seller
- where store_id = #{storeId} and flag = 0
- order by id desc
- </select>
- <update id="updateMessageOrderSellerRead" parameterType="java.lang.Integer">
- update message_order_seller
- set flag = 1
- where order_id = #{orderId}
- </update>
- <update id="updateReadStatusById">
- update message_order_seller
- set flag = 1
- where id = #{id}
- </update>
-
-
-</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageSystemAdvertiseMapper.xml b/oying-system/src/main/resources/mapper/message/MessageSystemAdvertiseMapper.xml
deleted file mode 100644
index 97ad099..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageSystemAdvertiseMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.oying.modules.message.mapper.MessageSystemAdvertiseMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageSystemAdvertise">
- <id column="id" property="id"/>
- <result column="title" property="title"/>
- <result column="content" property="content"/>
- <result column="image_url" property="imageUrl"/>
- <result column="link_url" property="linkUrl"/>
- <result column="status" property="status"/>
- <result column="create_by" property="createBy"/>
- <result column="update_by" property="updateBy"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id, title, content, image_url, link_url, status, create_by, update_by, create_time, update_time
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_system_advertise
- <where>
- </where>
- order by id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml b/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml
deleted file mode 100644
index 8ef7543..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.oying.modules.message.mapper.MessageSystemMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageSystem">
- <id column="id" property="id"/>
- <result column="start_time" property="startTime"/>
- <result column="end_time" property="endTime"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="create_by" property="createBy"/>
- <result column="update_by" property="updateBy"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id, start_time, end_time, create_time, update_time, create_by, update_by
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_system
- <where>
- </where>
- order by id desc
- </select>
-</mapper>
\ No newline at end of file
--
Gitblit v1.9.3