From a0adf52a33e382d070936fc4d3d58a27bc419690 Mon Sep 17 00:00:00 2001
From: leomon <2233021400@qq.com>
Date: Tue, 20 May 2025 20:18:06 +0800
Subject: [PATCH] 消息中心业务数据库表简化
---
oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.class | 0
oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderSellerMapper.class | 0
oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderBuyerMapper.java | 22 +
oying-system/target/classes/com/oying/modules/message/service/MessageOrderLeaveService.class | 0
oying-system/src/main/resources/mapper/message/MessageOrderBuyerMapper.xml | 25 +
oying-system/target/classes/com/oying/modules/message/domain/MessageSystem.class | 0
oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderLeave.java | 49 ++
oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.class | 0
oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java | 4
oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java | 77 +++
oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java | 23
oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.java | 77 +++
oying-system/target/classes/mapper/message/MessageOrderSellerMapper.xml | 25 +
oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java | 4
oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.class | 0
oying-system/target/classes/com/oying/modules/message/service/MessageSystemService.class | 0
oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderLeaveMapper.java | 22 +
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java | 73 +++
oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml | 10
oying-system/src/main/java/com/oying/modules/message/service/MessageOrderSellerService.java | 60 +++
oying-system/target/classes/com/oying/modules/message/service/MessageOrderSellerService.class | 0
oying-system/target/classes/com/oying/modules/message/rest/MessageSystemController.class | 0
oying-system/src/main/java/com/oying/modules/message/service/MessageOrderLeaveService.java | 60 +++
oying-system/src/main/java/com/oying/modules/message/service/MessageOrderBuyerService.java | 60 +++
oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSystemQueryCriteria.java | 6
oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderSellerMapper.java | 22 +
oying-system/target/classes/mapper/message/MessageSystemMapper.xml | 10
oying-system/target/classes/com/oying/modules/message/rest/MessageOrderBuyerController.class | 0
oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java | 4
oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.class | 0
oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.class | 0
oying-system/target/classes/com/oying/modules/message/service/impl/MessageSystemServiceImpl.class | 0
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java | 73 +++
oying-system/target/classes/mapper/message/MessageOrderLeaveMapper.xml | 25 +
oying-system/target/classes/com/oying/modules/message/rest/MessageOrderLeaveController.class | 0
oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml | 25 +
oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java | 8
oying-system/target/classes/com/oying/modules/message/domain/MessageOrderBuyer.class | 0
oying-system/src/main/java/com/oying/modules/message/mapper/MessageSystemMapper.java | 6
oying-system/target/classes/mapper/message/MessageOrderBuyerMapper.xml | 25 +
oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java | 50 ++
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java | 73 +++
oying-system/target/classes/com/oying/modules/message/domain/MessageOrderLeave.class | 0
oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderBuyer.java | 50 ++
oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java | 16
oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderLeaveMapper.class | 0
oying-system/src/main/resources/mapper/message/MessageOrderLeaveMapper.xml | 25 +
oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderBuyerMapper.class | 0
oying-system/target/classes/com/oying/modules/message/rest/MessageOrderSellerController.class | 0
oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.class | 0
/dev/null | 22 -
oying-system/target/classes/com/oying/modules/message/service/MessageOrderBuyerService.class | 0
oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.java | 77 +++
oying-system/target/classes/com/oying/modules/message/domain/MessageOrderSeller.class | 0
oying-system/src/main/java/com/oying/modules/message/service/MessageSystemService.java | 56 +-
55 files changed, 1,069 insertions(+), 95 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageBuyer.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageBuyer.java
deleted file mode 100644
index 8b6e12d..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageBuyer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.oying.modules.message.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-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-14
-**/
-@Data
-@TableName("message_buyer")
-public class MessageBuyer implements Serializable {
-
- @TableId(value = "buyer_message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增")
- private Long buyerMessageId;
-
- @NotNull
- @ApiModelProperty(value = "买家ID")
- private Long buyerId;
-
- @NotNull
- @ApiModelProperty(value = "外键，关联 `message_info` 表")
- private Long messageId;
-
- public void copy(MessageBuyer source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageCustomer.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageCustomer.java
deleted file mode 100644
index 6a7c5a6..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageCustomer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.oying.modules.message.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-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-14
-**/
-@Data
-@TableName("message_customer")
-public class MessageCustomer implements Serializable {
-
- @TableId(value = "customer_message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增")
- private Long customerMessageId;
-
- @NotNull
- @ApiModelProperty(value = "外键，关联 `message_info` 表")
- private Long messageId;
-
- @NotNull
- @ApiModelProperty(value = "关联的订单ID")
- private Long orderId;
-
- @NotBlank
- @ApiModelProperty(value = "顾客的评价内容")
- private String reviewContent;
-
- @ApiModelProperty(value = "商户的回复内容")
- private String replyContent;
-
- public void copy(MessageCustomer source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageInfo.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageInfo.java
deleted file mode 100644
index 0097aa2..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.oying.modules.message.domain;
-
-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-06
-**/
-@Data
-@TableName("message_info")
-public class MessageInfo implements Serializable {
-
- @TableId(value = "message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键自增")
- private Long messageId;
-
- @NotNull
- @ApiModelProperty(value = "消息类型('SYSTEM', 'ORDER', 'CUSTOMER')")
- private String messageType;
-
- @NotBlank
- @ApiModelProperty(value = "消息标题")
- private String title;
-
- @NotBlank
- @ApiModelProperty(value = "消息内容")
- private String content;
-
- @NotNull
- @ApiModelProperty(value = "消息状态（未读/已读）")
- private String status;
-
- @NotNull
- @ApiModelProperty(value = "消息创建时间")
- private Timestamp createdAt;
-
- @NotNull
- @ApiModelProperty(value = "消息更新时间")
- private Timestamp updatedAt;
-
- @ApiModelProperty(value = "消息跳转链接（订单详情或评价详情）")
- private String link;
-
- public void copy(MessageInfo source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrder.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrder.java
deleted file mode 100644
index 43cf9bb..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.oying.modules.message.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-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-14
-**/
-@Data
-@TableName("message_order")
-public class MessageOrder implements Serializable {
-
- @TableId(value = "order_message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增")
- private Long orderMessageId;
-
- @NotNull
- @ApiModelProperty(value = "外键，关联 `message_info` 表")
- private Long messageId;
-
- @NotNull
- @ApiModelProperty(value = "关联的订单ID")
- private Long orderId;
-
- public void copy(MessageOrder source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
- }
-}
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
new file mode 100644
index 0000000..7ba0b0a
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderBuyer.java
@@ -0,0 +1,50 @@
+package com.oying.modules.message.domain;
+
+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 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 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
new file mode 100644
index 0000000..efd47c5
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderLeave.java
@@ -0,0 +1,49 @@
+package com.oying.modules.message.domain;
+
+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 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;
+
+ @ApiModelProperty(value = "商家回复内容")
+ private String sellerReply;
+
+ @NotBlank
+ @ApiModelProperty(value = "跳转链接")
+ private String 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
new file mode 100644
index 0000000..3f04170
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java
@@ -0,0 +1,50 @@
+package com.oying.modules.message.domain;
+
+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 implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
+ private Integer id;
+
+ @NotNull
+ @ApiModelProperty(value = "orderId")
+ private Integer orderId;
+
+ @NotBlank
+ @ApiModelProperty(value = "messageType")
+ private String messageType;
+
+ @NotBlank
+ @ApiModelProperty(value = "messageContent")
+ private String messageContent;
+
+ @NotBlank
+ @ApiModelProperty(value = "link")
+ private String link;
+
+ @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/MessageSeller.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageSeller.java
deleted file mode 100644
index 7c8cc4d..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSeller.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.oying.modules.message.domain;
-
-import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
-import cn.hutool.core.bean.copier.CopyOptions;
-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-14
-**/
-@Data
-@TableName("message_seller")
-public class MessageSeller implements Serializable {
-
- @TableId(value = "seller_message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "sellerMessageId")
- private Long sellerMessageId;
-
- @NotNull
- @ApiModelProperty(value = "sellerId")
- private Long sellerId;
-
- @NotNull
- @ApiModelProperty(value = "messageId")
- private Long messageId;
-
- public void copy(MessageSeller 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
index 78b5cda..3e4c28d 100644
--- 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
@@ -12,24 +12,25 @@
import com.baomidou.mybatisplus.annotation.TableName;
/**
-* @description /
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @description /
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@Data
@TableName("message_system")
public class MessageSystem implements Serializable {
- @TableId(value = "system_message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增")
- private Long systemMessageId;
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
+ private Integer id;
@NotNull
- @ApiModelProperty(value = "外键，关联 `message_info` 表")
- private Long messageId;
+ @ApiModelProperty(value = "系统维护开始时间")
+ private Timestamp startTime;
- @ApiModelProperty(value = "系统维护时间")
- private Timestamp maintenanceTime;
+ @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/dto/MessageCustomerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageCustomerQueryCriteria.java
deleted file mode 100644
index 59ccea8..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageCustomerQueryCriteria.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-14
-**/
-@Data
-public class MessageCustomerQueryCriteria{
-
- @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/MessageInfoQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageInfoQueryCriteria.java
deleted file mode 100644
index 9d725df..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageInfoQueryCriteria.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-06
-**/
-@Data
-public class MessageInfoQueryCriteria{
-
- @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/MessageBuyerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java
similarity index 83%
rename from oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java
rename to oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java
index 973751b..0ccbeef 100644
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.java
@@ -5,10 +5,10 @@
/**
* @author 李萌
-* @date 2025-05-14
+* @date 2025-05-20
**/
@Data
-public class MessageBuyerQueryCriteria{
+public class MessageOrderBuyerQueryCriteria{
@ApiModelProperty(value = "页码", example = "1")
private Integer page = 1;
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java
similarity index 83%
copy from oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java
copy to oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java
index 973751b..c0c98b9 100644
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.java
@@ -5,10 +5,10 @@
/**
* @author 李萌
-* @date 2025-05-14
+* @date 2025-05-20
**/
@Data
-public class MessageBuyerQueryCriteria{
+public class MessageOrderLeaveQueryCriteria{
@ApiModelProperty(value = "页码", example = "1")
private Integer page = 1;
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderQueryCriteria.java
deleted file mode 100644
index 96445c4..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderQueryCriteria.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-14
-**/
-@Data
-public class MessageOrderQueryCriteria{
-
- @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/MessageBuyerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java
similarity index 83%
copy from oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java
copy to oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java
index 973751b..c514533 100644
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.java
@@ -5,10 +5,10 @@
/**
* @author 李萌
-* @date 2025-05-14
+* @date 2025-05-20
**/
@Data
-public class MessageBuyerQueryCriteria{
+public class MessageOrderSellerQueryCriteria{
@ApiModelProperty(value = "页码", example = "1")
private Integer page = 1;
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.java
deleted file mode 100644
index 4865f7d..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.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-14
-**/
-@Data
-public class MessageSellerQueryCriteria{
-
- @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
index c73e787..0ba80fc 100644
--- 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
@@ -4,9 +4,9 @@
import io.swagger.annotations.ApiModelProperty;
/**
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@Data
public class MessageSystemQueryCriteria{
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageBuyerMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageBuyerMapper.java
deleted file mode 100644
index dba7a94..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageBuyerMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageBuyer;
-import com.oying.modules.message.domain.dto.MessageBuyerQueryCriteria;
-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-14
-**/
-@Mapper
-public interface MessageBuyerMapper extends BaseMapper<MessageBuyer> {
-
- IPage<MessageBuyer> findAll(@Param("criteria") MessageBuyerQueryCriteria criteria, Page<Object> page);
-
- List<MessageBuyer> findAll(@Param("criteria") MessageBuyerQueryCriteria criteria);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageCustomerMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageCustomerMapper.java
deleted file mode 100644
index ad8837f..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageCustomerMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageCustomer;
-import com.oying.modules.message.domain.dto.MessageCustomerQueryCriteria;
-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-14
-**/
-@Mapper
-public interface MessageCustomerMapper extends BaseMapper<MessageCustomer> {
-
- IPage<MessageCustomer> findAll(@Param("criteria") MessageCustomerQueryCriteria criteria, Page<Object> page);
-
- List<MessageCustomer> findAll(@Param("criteria") MessageCustomerQueryCriteria criteria);
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageInfoMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageInfoMapper.java
deleted file mode 100644
index 2a63fb2..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageInfoMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageInfo;
-import com.oying.modules.message.domain.dto.MessageInfoQueryCriteria;
-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-06
-**/
-@Mapper
-public interface MessageInfoMapper extends BaseMapper<MessageInfo> {
-
- IPage<MessageInfo> findAll(@Param("criteria") MessageInfoQueryCriteria criteria, Page<Object> page);
-
- List<MessageInfo> findAll(@Param("criteria") MessageInfoQueryCriteria criteria);
-}
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
new file mode 100644
index 0000000..b8d6ac1
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderBuyerMapper.java
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000..4adbee8
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderLeaveMapper.java
@@ -0,0 +1,22 @@
+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/MessageOrderMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderMapper.java
deleted file mode 100644
index 1a809cc..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageOrder;
-import com.oying.modules.message.domain.dto.MessageOrderQueryCriteria;
-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-14
-**/
-@Mapper
-public interface MessageOrderMapper extends BaseMapper<MessageOrder> {
-
- IPage<MessageOrder> findAll(@Param("criteria") MessageOrderQueryCriteria criteria, Page<Object> page);
-
- List<MessageOrder> findAll(@Param("criteria") MessageOrderQueryCriteria 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
new file mode 100644
index 0000000..be1783a
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderSellerMapper.java
@@ -0,0 +1,22 @@
+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);
+}
diff --git a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSellerMapper.java b/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSellerMapper.java
deleted file mode 100644
index 0d000e8..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/mapper/MessageSellerMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.oying.modules.message.mapper;
-
-import com.oying.modules.message.domain.MessageSeller;
-import com.oying.modules.message.domain.dto.MessageSellerQueryCriteria;
-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-14
-**/
-@Mapper
-public interface MessageSellerMapper extends BaseMapper<MessageSeller> {
-
- IPage<MessageSeller> findAll(@Param("criteria") MessageSellerQueryCriteria criteria, Page<Object> page);
-
- List<MessageSeller> findAll(@Param("criteria") MessageSellerQueryCriteria 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
index 05bca36..959cde3 100644
--- 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
@@ -10,9 +10,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@Mapper
public interface MessageSystemMapper extends BaseMapper<MessageSystem> {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageBuyerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageBuyerController.java
deleted file mode 100644
index 07a8b3d..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageBuyerController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageBuyer;
-import com.oying.modules.message.service.MessageBuyerService;
-import com.oying.modules.message.domain.dto.MessageBuyerQueryCriteria;
-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-14
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "消息_买家")
-@RequestMapping("/api/messageBuyer")
-public class MessageBuyerController {
-
- private final MessageBuyerService messageBuyerService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('messageBuyer:list')")
- public void exportMessageBuyer(HttpServletResponse response, MessageBuyerQueryCriteria criteria) throws IOException {
- messageBuyerService.download(messageBuyerService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息_买家")
- @PreAuthorize("@el.check('messageBuyer:list')")
- public ResponseEntity<PageResult<MessageBuyer>> queryMessageBuyer(MessageBuyerQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageBuyerService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息_买家")
- @ApiOperation("新增消息_买家")
- @PreAuthorize("@el.check('messageBuyer:add')")
- public ResponseEntity<Object> createMessageBuyer(@Validated @RequestBody MessageBuyer resources){
- messageBuyerService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息_买家")
- @ApiOperation("修改消息_买家")
- @PreAuthorize("@el.check('messageBuyer:edit')")
- public ResponseEntity<Object> updateMessageBuyer(@Validated @RequestBody MessageBuyer resources){
- messageBuyerService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息_买家")
- @ApiOperation("删除消息_买家")
- @PreAuthorize("@el.check('messageBuyer:del')")
- public ResponseEntity<Object> deleteMessageBuyer(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- messageBuyerService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageCustomerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageCustomerController.java
deleted file mode 100644
index 1c3e0d5..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageCustomerController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageCustomer;
-import com.oying.modules.message.service.MessageCustomerService;
-import com.oying.modules.message.domain.dto.MessageCustomerQueryCriteria;
-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-14
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "消息_顾客")
-@RequestMapping("/api/messageCustomer")
-public class MessageCustomerController {
-
- private final MessageCustomerService messageCustomerService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('messageCustomer:list')")
- public void exportMessageCustomer(HttpServletResponse response, MessageCustomerQueryCriteria criteria) throws IOException {
- messageCustomerService.download(messageCustomerService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息_顾客")
- @PreAuthorize("@el.check('messageCustomer:list')")
- public ResponseEntity<PageResult<MessageCustomer>> queryMessageCustomer(MessageCustomerQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageCustomerService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息_顾客")
- @ApiOperation("新增消息_顾客")
- @PreAuthorize("@el.check('messageCustomer:add')")
- public ResponseEntity<Object> createMessageCustomer(@Validated @RequestBody MessageCustomer resources){
- messageCustomerService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息_顾客")
- @ApiOperation("修改消息_顾客")
- @PreAuthorize("@el.check('messageCustomer:edit')")
- public ResponseEntity<Object> updateMessageCustomer(@Validated @RequestBody MessageCustomer resources){
- messageCustomerService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息_顾客")
- @ApiOperation("删除消息_顾客")
- @PreAuthorize("@el.check('messageCustomer:del')")
- public ResponseEntity<Object> deleteMessageCustomer(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- messageCustomerService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageInfoController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageInfoController.java
deleted file mode 100644
index 19a5999..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageInfoController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageInfo;
-import com.oying.modules.message.service.MessageInfoService;
-import com.oying.modules.message.domain.dto.MessageInfoQueryCriteria;
-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-06
-**/
-@RestController
-@RequiredArgsConstructor//final注入
-@Api(tags = "消息")
-@RequestMapping("/api/messageInfo")
-public class MessageInfoController {
-
- private final MessageInfoService messageInfoService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('messageInfo:list')")
- public void exportMessageInfo(HttpServletResponse response, MessageInfoQueryCriteria criteria) throws IOException {
- messageInfoService.download(messageInfoService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('messageInfo:list')")
- public ResponseEntity<PageResult<MessageInfo>> queryMessageInfo(MessageInfoQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageInfoService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('messageInfo:add')")
- public ResponseEntity<Object> createMessageInfo(@Validated @RequestBody MessageInfo resources){
- messageInfoService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('messageInfo:edit')")
- public ResponseEntity<Object> updateMessageInfo(@Validated @RequestBody MessageInfo resources){
- messageInfoService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('messageInfo:del')")
- public ResponseEntity<Object> deleteMessageInfo(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- messageInfoService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
-
-}
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
new file mode 100644
index 0000000..5f6278d
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java
@@ -0,0 +1,73 @@
+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 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
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "买家端订单消息通知")
+@RequestMapping("/api/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 ResponseEntity<PageResult<MessageOrderBuyer>> queryMessageOrderBuyer(MessageOrderBuyerQueryCriteria criteria){
+ Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+ return new ResponseEntity<>(messageOrderBuyerService.queryAll(criteria,page),HttpStatus.OK);
+ }
+
+ @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);
+ }
+}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderController.java
deleted file mode 100644
index 159212a..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageOrder;
-import com.oying.modules.message.service.MessageOrderService;
-import com.oying.modules.message.domain.dto.MessageOrderQueryCriteria;
-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-14
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "消息_订单")
-@RequestMapping("/api/messageOrder")
-public class MessageOrderController {
-
- private final MessageOrderService messageOrderService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('messageOrder:list')")
- public void exportMessageOrder(HttpServletResponse response, MessageOrderQueryCriteria criteria) throws IOException {
- messageOrderService.download(messageOrderService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息_订单")
- @PreAuthorize("@el.check('messageOrder:list')")
- public ResponseEntity<PageResult<MessageOrder>> queryMessageOrder(MessageOrderQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageOrderService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息_订单")
- @ApiOperation("新增消息_订单")
- @PreAuthorize("@el.check('messageOrder:add')")
- public ResponseEntity<Object> createMessageOrder(@Validated @RequestBody MessageOrder resources){
- messageOrderService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息_订单")
- @ApiOperation("修改消息_订单")
- @PreAuthorize("@el.check('messageOrder:edit')")
- public ResponseEntity<Object> updateMessageOrder(@Validated @RequestBody MessageOrder resources){
- messageOrderService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息_订单")
- @ApiOperation("删除消息_订单")
- @PreAuthorize("@el.check('messageOrder:del')")
- public ResponseEntity<Object> deleteMessageOrder(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- messageOrderService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
-}
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
new file mode 100644
index 0000000..3244192
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java
@@ -0,0 +1,73 @@
+package com.oying.modules.message.rest;
+
+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 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
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "消息留言")
+@RequestMapping("/api/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 ResponseEntity<PageResult<MessageOrderLeave>> queryMessageOrderLeave(MessageOrderLeaveQueryCriteria criteria){
+ Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+ return new ResponseEntity<>(messageOrderLeaveService.queryAll(criteria,page),HttpStatus.OK);
+ }
+
+ @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);
+ }
+}
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
new file mode 100644
index 0000000..eaa6a4b
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java
@@ -0,0 +1,73 @@
+package com.oying.modules.message.rest;
+
+import com.oying.annotation.Log;
+import com.oying.modules.message.domain.MessageOrderSeller;
+import com.oying.modules.message.service.MessageOrderSellerService;
+import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
+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
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "卖家端订单消息通知")
+@RequestMapping("/api/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 ResponseEntity<PageResult<MessageOrderSeller>> queryMessageOrderSeller(MessageOrderSellerQueryCriteria criteria){
+ Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+ return new ResponseEntity<>(messageOrderSellerService.queryAll(criteria,page),HttpStatus.OK);
+ }
+
+ @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);
+ }
+}
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSellerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageSellerController.java
deleted file mode 100644
index 700472f..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSellerController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.oying.modules.message.rest;
-
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MessageSeller;
-import com.oying.modules.message.service.MessageSellerService;
-import com.oying.modules.message.domain.dto.MessageSellerQueryCriteria;
-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-14
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "消息_卖家")
-@RequestMapping("/api/messageSeller")
-public class MessageSellerController {
-
- private final MessageSellerService messageSellerService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('messageSeller:list')")
- public void exportMessageSeller(HttpServletResponse response, MessageSellerQueryCriteria criteria) throws IOException {
- messageSellerService.download(messageSellerService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息_卖家")
- @PreAuthorize("@el.check('messageSeller:list')")
- public ResponseEntity<PageResult<MessageSeller>> queryMessageSeller(MessageSellerQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageSellerService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息_卖家")
- @ApiOperation("新增消息_卖家")
- @PreAuthorize("@el.check('messageSeller:add')")
- public ResponseEntity<Object> createMessageSeller(@Validated @RequestBody MessageSeller resources){
- messageSellerService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息_卖家")
- @ApiOperation("修改消息_卖家")
- @PreAuthorize("@el.check('messageSeller:edit')")
- public ResponseEntity<Object> updateMessageSeller(@Validated @RequestBody MessageSeller resources){
- messageSellerService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息_卖家")
- @ApiOperation("删除消息_卖家")
- @PreAuthorize("@el.check('messageSeller:del')")
- public ResponseEntity<Object> deleteMessageSeller(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- messageSellerService.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
index 04ea356..af58c2a 100644
--- 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
@@ -18,9 +18,9 @@
import com.oying.utils.PageResult;
/**
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@RestController
@RequiredArgsConstructor
@Api(tags = "消息_系统")
@@ -66,7 +66,7 @@
@Log("删除消息_系统")
@ApiOperation("删除消息_系统")
@PreAuthorize("@el.check('messageSystem:del')")
- public ResponseEntity<Object> deleteMessageSystem(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+ public ResponseEntity<Object> deleteMessageSystem(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
messageSystemService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageBuyerService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageBuyerService.java
deleted file mode 100644
index 9681547..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageBuyerService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageBuyer;
-import com.oying.modules.message.domain.dto.MessageBuyerQueryCriteria;
-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-14
-**/
-public interface MessageBuyerService extends IService<MessageBuyer> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageBuyer> queryAll(MessageBuyerQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageBuyerDto>
- */
- List<MessageBuyer> queryAll(MessageBuyerQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageBuyer resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageBuyer resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageBuyer> all, HttpServletResponse response) throws IOException;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageCustomerService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageCustomerService.java
deleted file mode 100644
index 1510f52..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageCustomerService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageCustomer;
-import com.oying.modules.message.domain.dto.MessageCustomerQueryCriteria;
-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-14
-**/
-public interface MessageCustomerService extends IService<MessageCustomer> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageCustomer> queryAll(MessageCustomerQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageCustomerDto>
- */
- List<MessageCustomer> queryAll(MessageCustomerQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageCustomer resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageCustomer resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageCustomer> all, HttpServletResponse response) throws IOException;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageInfoService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageInfoService.java
deleted file mode 100644
index 7fe4a6e..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageInfoService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageInfo;
-import com.oying.modules.message.domain.dto.MessageInfoQueryCriteria;
-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-06
-**/
-public interface MessageInfoService extends IService<MessageInfo> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageInfo> queryAll(MessageInfoQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageInfoDto>
- */
- List<MessageInfo> queryAll(MessageInfoQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageInfo resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageInfo resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageInfo> all, HttpServletResponse response) throws IOException;
-}
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
new file mode 100644
index 0000000..3abe91b
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderBuyerService.java
@@ -0,0 +1,60 @@
+package com.oying.modules.message.service;
+
+import com.oying.modules.message.domain.MessageOrderBuyer;
+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;
+}
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
new file mode 100644
index 0000000..1f0ce0d
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderLeaveService.java
@@ -0,0 +1,60 @@
+package com.oying.modules.message.service;
+
+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;
+}
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
new file mode 100644
index 0000000..038f650
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderSellerService.java
@@ -0,0 +1,60 @@
+package com.oying.modules.message.service;
+
+import com.oying.modules.message.domain.MessageOrderSeller;
+import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
+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 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;
+}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderService.java
deleted file mode 100644
index 322f19a..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageOrderService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageOrder;
-import com.oying.modules.message.domain.dto.MessageOrderQueryCriteria;
-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-14
-**/
-public interface MessageOrderService extends IService<MessageOrder> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageOrder> queryAll(MessageOrderQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageOrderDto>
- */
- List<MessageOrder> queryAll(MessageOrderQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageOrder resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageOrder resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageOrder> all, HttpServletResponse response) throws IOException;
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MessageSellerService.java b/oying-system/src/main/java/com/oying/modules/message/service/MessageSellerService.java
deleted file mode 100644
index b7a64da..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/MessageSellerService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.oying.modules.message.service;
-
-import com.oying.modules.message.domain.MessageSeller;
-import com.oying.modules.message.domain.dto.MessageSellerQueryCriteria;
-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-14
-**/
-public interface MessageSellerService extends IService<MessageSeller> {
-
- /**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
- PageResult<MessageSeller> queryAll(MessageSellerQueryCriteria criteria, Page<Object> page);
-
- /**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageSellerDto>
- */
- List<MessageSeller> queryAll(MessageSellerQueryCriteria criteria);
-
- /**
- * 创建
- * @param resources /
- */
- void create(MessageSeller resources);
-
- /**
- * 编辑
- * @param resources /
- */
- void update(MessageSeller resources);
-
- /**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
-
- /**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
- void download(List<MessageSeller> 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
index 13838d4..713df86 100644
--- 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
@@ -11,50 +11,50 @@
import com.oying.utils.PageResult;
/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @description 服务接口
+ * @author 李萌
+ * @date 2025-05-20
+ **/
public interface MessageSystemService extends IService<MessageSystem> {
/**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
+ * 查询数据分页
+ * @param criteria 条件
+ * @param page 分页参数
+ * @return PageResult
+ */
PageResult<MessageSystem> queryAll(MessageSystemQueryCriteria criteria, Page<Object> page);
/**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MessageSystemDto>
- */
+ * 查询所有数据不分页
+ * @param criteria 条件参数
+ * @return List<MessageSystemDto>
+ */
List<MessageSystem> queryAll(MessageSystemQueryCriteria criteria);
/**
- * 创建
- * @param resources /
- */
+ * 创建
+ * @param resources /
+ */
void create(MessageSystem resources);
/**
- * 编辑
- * @param resources /
- */
+ * 编辑
+ * @param resources /
+ */
void update(MessageSystem resources);
/**
- * 多选删除
- * @param ids /
- */
- void deleteAll(List<Long> ids);
+ * 多选删除
+ * @param ids /
+ */
+ void deleteAll(List<Integer> ids);
/**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
+ * 导出数据
+ * @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/MessageBuyerServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageBuyerServiceImpl.java
deleted file mode 100644
index 72cf5de..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageBuyerServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.oying.modules.message.domain.MessageBuyer;
-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.MessageBuyerService;
-import com.oying.modules.message.domain.dto.MessageBuyerQueryCriteria;
-import com.oying.modules.message.mapper.MessageBuyerMapper;
-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-14
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageBuyerServiceImpl extends ServiceImpl<MessageBuyerMapper, MessageBuyer> implements MessageBuyerService {
-
- private final MessageBuyerMapper messageBuyerMapper;
-
- @Override
- public PageResult<MessageBuyer> queryAll(MessageBuyerQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageBuyerMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageBuyer> queryAll(MessageBuyerQueryCriteria criteria){
- return messageBuyerMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageBuyer resources) {
- messageBuyerMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageBuyer resources) {
- MessageBuyer messageBuyer = getById(resources.getBuyerMessageId());
- messageBuyer.copy(resources);
- messageBuyerMapper.updateById(messageBuyer);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
- messageBuyerMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageBuyer> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageBuyer messageBuyer : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("买家ID", messageBuyer.getBuyerId());
- map.put("外键，关联 `message_info` 表", messageBuyer.getMessageId());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageCustomerServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageCustomerServiceImpl.java
deleted file mode 100644
index 2c2d81c..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageCustomerServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.oying.modules.message.domain.MessageCustomer;
-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.MessageCustomerService;
-import com.oying.modules.message.domain.dto.MessageCustomerQueryCriteria;
-import com.oying.modules.message.mapper.MessageCustomerMapper;
-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-14
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageCustomerServiceImpl extends ServiceImpl<MessageCustomerMapper, MessageCustomer> implements MessageCustomerService {
-
- private final MessageCustomerMapper messageCustomerMapper;
-
- @Override
- public PageResult<MessageCustomer> queryAll(MessageCustomerQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageCustomerMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageCustomer> queryAll(MessageCustomerQueryCriteria criteria){
- return messageCustomerMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageCustomer resources) {
- messageCustomerMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageCustomer resources) {
- MessageCustomer messageCustomer = getById(resources.getCustomerMessageId());
- messageCustomer.copy(resources);
- messageCustomerMapper.updateById(messageCustomer);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
- messageCustomerMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageCustomer> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageCustomer messageCustomer : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("外键，关联 `message_info` 表", messageCustomer.getMessageId());
- map.put("关联的订单ID", messageCustomer.getOrderId());
- map.put("顾客的评价内容", messageCustomer.getReviewContent());
- map.put("商户的回复内容", messageCustomer.getReplyContent());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageInfoServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageInfoServiceImpl.java
deleted file mode 100644
index 12baff9..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageInfoServiceImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.oying.modules.message.domain.MessageInfo;
-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.MessageInfoService;
-import com.oying.modules.message.domain.dto.MessageInfoQueryCriteria;
-import com.oying.modules.message.mapper.MessageInfoMapper;
-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-06
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, MessageInfo> implements MessageInfoService {
-
- private final MessageInfoMapper messageInfoMapper;
-
- @Override
- public PageResult<MessageInfo> queryAll(MessageInfoQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageInfoMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageInfo> queryAll(MessageInfoQueryCriteria criteria){
- return messageInfoMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageInfo resources) {
- messageInfoMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageInfo resources) {
- MessageInfo messageInfo = getById(resources.getMessageId());
- messageInfo.copy(resources);
- messageInfoMapper.updateById(messageInfo);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
- messageInfoMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageInfo> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageInfo messageInfo : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("消息类型('SYSTEM', 'ORDER', 'CUSTOMER')", messageInfo.getMessageType());
- map.put("消息标题", messageInfo.getTitle());
- map.put("消息内容", messageInfo.getContent());
- map.put("消息状态（未读/已读）", messageInfo.getStatus());
- map.put("消息创建时间", messageInfo.getCreatedAt());
- map.put("消息更新时间", messageInfo.getUpdatedAt());
- map.put("消息跳转链接（订单详情或评价详情）", messageInfo.getLink());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-}
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
new file mode 100644
index 0000000..72b1b20
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.java
@@ -0,0 +1,77 @@
+package com.oying.modules.message.service.impl;
+
+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);
+ }
+}
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
new file mode 100644
index 0000000..081c554
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java
@@ -0,0 +1,77 @@
+package com.oying.modules.message.service.impl;
+
+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);
+ }
+}
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
new file mode 100644
index 0000000..5d65145
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.java
@@ -0,0 +1,77 @@
+package com.oying.modules.message.service.impl;
+
+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 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 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);
+ }
+}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderServiceImpl.java
deleted file mode 100644
index dda5ee3..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.oying.modules.message.domain.MessageOrder;
-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.MessageOrderService;
-import com.oying.modules.message.domain.dto.MessageOrderQueryCriteria;
-import com.oying.modules.message.mapper.MessageOrderMapper;
-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-14
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageOrderServiceImpl extends ServiceImpl<MessageOrderMapper, MessageOrder> implements MessageOrderService {
-
- private final MessageOrderMapper messageOrderMapper;
-
- @Override
- public PageResult<MessageOrder> queryAll(MessageOrderQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageOrderMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageOrder> queryAll(MessageOrderQueryCriteria criteria){
- return messageOrderMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageOrder resources) {
- messageOrderMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageOrder resources) {
- MessageOrder messageOrder = getById(resources.getOrderMessageId());
- messageOrder.copy(resources);
- messageOrderMapper.updateById(messageOrder);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
- messageOrderMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageOrder> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageOrder messageOrder : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("外键，关联 `message_info` 表", messageOrder.getMessageId());
- map.put("关联的订单ID", messageOrder.getOrderId());
- list.add(map);
- }
- FileUtil.downloadExcel(list, response);
- }
-}
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSellerServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSellerServiceImpl.java
deleted file mode 100644
index bba73a0..0000000
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSellerServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.oying.modules.message.service.impl;
-
-import com.oying.modules.message.domain.MessageSeller;
-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.MessageSellerService;
-import com.oying.modules.message.domain.dto.MessageSellerQueryCriteria;
-import com.oying.modules.message.mapper.MessageSellerMapper;
-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-14
-**/
-@Service
-@RequiredArgsConstructor
-public class MessageSellerServiceImpl extends ServiceImpl<MessageSellerMapper, MessageSeller> implements MessageSellerService {
-
- private final MessageSellerMapper messageSellerMapper;
-
- @Override
- public PageResult<MessageSeller> queryAll(MessageSellerQueryCriteria criteria, Page<Object> page){
- return PageUtil.toPage(messageSellerMapper.findAll(criteria, page));
- }
-
- @Override
- public List<MessageSeller> queryAll(MessageSellerQueryCriteria criteria){
- return messageSellerMapper.findAll(criteria);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(MessageSeller resources) {
- messageSellerMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(MessageSeller resources) {
- MessageSeller messageSeller = getById(resources.getSellerMessageId());
- messageSeller.copy(resources);
- messageSellerMapper.updateById(messageSeller);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
- messageSellerMapper.deleteBatchIds(ids);
- }
-
- @Override
- public void download(List<MessageSeller> all, HttpServletResponse response) throws IOException {
- List<Map<String, Object>> list = new ArrayList<>();
- for (MessageSeller messageSeller : all) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put(" sellerId", messageSeller.getSellerId());
- map.put(" messageId", messageSeller.getMessageId());
- 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
index ba531dd..2ffb55c 100644
--- 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
@@ -20,10 +20,10 @@
import com.oying.utils.PageResult;
/**
-* @description 服务实现
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @description 服务实现
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@Service
@RequiredArgsConstructor
public class MessageSystemServiceImpl extends ServiceImpl<MessageSystemMapper, MessageSystem> implements MessageSystemService {
@@ -49,14 +49,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void update(MessageSystem resources) {
- MessageSystem messageSystem = getById(resources.getSystemMessageId());
+ MessageSystem messageSystem = getById(resources.getId());
messageSystem.copy(resources);
messageSystemMapper.updateById(messageSystem);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
+ public void deleteAll(List<Integer> ids) {
messageSystemMapper.deleteBatchIds(ids);
}
@@ -65,8 +65,8 @@
List<Map<String, Object>> list = new ArrayList<>();
for (MessageSystem messageSystem : all) {
Map<String, Object> map = new LinkedHashMap<>();
- map.put("外键，关联 `message_info` 表", messageSystem.getMessageId());
- map.put("系统维护时间", messageSystem.getMaintenanceTime());
+ 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/MessageBuyerMapper.xml b/oying-system/src/main/resources/mapper/message/MessageBuyerMapper.xml
deleted file mode 100644
index 791578a..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageBuyerMapper.xml
+++ /dev/null
@@ -1,22 +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.MessageBuyerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageBuyer">
- <id column="buyer_message_id" property="buyerMessageId"/>
- <result column="buyer_id" property="buyerId"/>
- <result column="message_id" property="messageId"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- buyer_message_id, buyer_id, message_id
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_buyer
- <where>
- </where>
- order by buyer_message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageCustomerMapper.xml b/oying-system/src/main/resources/mapper/message/MessageCustomerMapper.xml
deleted file mode 100644
index b8d5c4a..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageCustomerMapper.xml
+++ /dev/null
@@ -1,24 +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.MessageCustomerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageCustomer">
- <id column="customer_message_id" property="customerMessageId"/>
- <result column="message_id" property="messageId"/>
- <result column="order_id" property="orderId"/>
- <result column="review_content" property="reviewContent"/>
- <result column="reply_content" property="replyContent"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- customer_message_id, message_id, order_id, review_content, reply_content
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_customer
- <where>
- </where>
- order by customer_message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageInfoMapper.xml b/oying-system/src/main/resources/mapper/message/MessageInfoMapper.xml
deleted file mode 100644
index ca72391..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageInfoMapper.xml
+++ /dev/null
@@ -1,27 +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.MessageInfoMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageInfo">
- <id column="message_id" property="messageId"/>
- <result column="message_type" property="messageType"/>
- <result column="title" property="title"/>
- <result column="content" property="content"/>
- <result column="status" property="status"/>
- <result column="created_at" property="createdAt"/>
- <result column="updated_at" property="updatedAt"/>
- <result column="link" property="link"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- message_id, message_type, title, content, status, created_at, updated_at, link
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_info
- <where>
- </where>
- order by message_id desc
- </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
new file mode 100644
index 0000000..9235ee3
--- /dev/null
+++ b/oying-system/src/main/resources/mapper/message/MessageOrderBuyerMapper.xml
@@ -0,0 +1,25 @@
+<?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"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, order_id, message_type, message_content, link, create_time
+ </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
new file mode 100644
index 0000000..48b3fbe
--- /dev/null
+++ b/oying-system/src/main/resources/mapper/message/MessageOrderLeaveMapper.xml
@@ -0,0 +1,25 @@
+<?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"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, order_id, customer_review, seller_reply, link, create_time
+ </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/MessageOrderMapper.xml b/oying-system/src/main/resources/mapper/message/MessageOrderMapper.xml
deleted file mode 100644
index 4b04a77..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageOrderMapper.xml
+++ /dev/null
@@ -1,22 +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.MessageOrderMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageOrder">
- <id column="order_message_id" property="orderMessageId"/>
- <result column="message_id" property="messageId"/>
- <result column="order_id" property="orderId"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- order_message_id, message_id, order_id
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_order
- <where>
- </where>
- order by order_message_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
new file mode 100644
index 0000000..1150b53
--- /dev/null
+++ b/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml
@@ -0,0 +1,25 @@
+<?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="message_type" property="messageType"/>
+ <result column="message_content" property="messageContent"/>
+ <result column="link" property="link"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, order_id, message_type, message_content, link, create_time
+ </sql>
+
+ <select id="findAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from message_order_seller
+ <where>
+ </where>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/oying-system/src/main/resources/mapper/message/MessageSellerMapper.xml b/oying-system/src/main/resources/mapper/message/MessageSellerMapper.xml
deleted file mode 100644
index 523df49..0000000
--- a/oying-system/src/main/resources/mapper/message/MessageSellerMapper.xml
+++ /dev/null
@@ -1,22 +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.MessageSellerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageSeller">
- <id column="seller_message_id" property="sellerMessageId"/>
- <result column="seller_id" property="sellerId"/>
- <result column="message_id" property="messageId"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- seller_message_id, seller_id, message_id
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_seller
- <where>
- </where>
- order by seller_message_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
index 3db87d9..b03dca7 100644
--- a/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml
+++ b/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml
@@ -2,13 +2,13 @@
<!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="system_message_id" property="systemMessageId"/>
- <result column="message_id" property="messageId"/>
- <result column="maintenance_time" property="maintenanceTime"/>
+ <id column="id" property="id"/>
+ <result column="start_time" property="startTime"/>
+ <result column="end_time" property="endTime"/>
</resultMap>
<sql id="Base_Column_List">
- system_message_id, message_id, maintenance_time
+ id, start_time, end_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -17,6 +17,6 @@
from message_system
<where>
</where>
- order by system_message_id desc
+ order by id desc
</select>
</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageBuyer.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageBuyer.class
deleted file mode 100644
index cb1b8fe..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/MessageBuyer.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageCustomer.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageCustomer.class
deleted file mode 100644
index 07f35ed..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/MessageCustomer.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageInfo.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageInfo.class
deleted file mode 100644
index 3642416..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/MessageInfo.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageOrder.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrder.class
deleted file mode 100644
index 20fb67d..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/MessageOrder.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderBuyer.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderBuyer.class
new file mode 100644
index 0000000..e16cbbe
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderBuyer.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderLeave.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderLeave.class
new file mode 100644
index 0000000..059811f
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderLeave.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderSeller.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderSeller.class
new file mode 100644
index 0000000..8f9e589
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/domain/MessageOrderSeller.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageSeller.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageSeller.class
deleted file mode 100644
index c30ba11..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/MessageSeller.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/MessageSystem.class b/oying-system/target/classes/com/oying/modules/message/domain/MessageSystem.class
index efabd7c..314fac9 100644
--- a/oying-system/target/classes/com/oying/modules/message/domain/MessageSystem.class
+++ b/oying-system/target/classes/com/oying/modules/message/domain/MessageSystem.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.class
deleted file mode 100644
index 1c488d4..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageBuyerQueryCriteria.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageCustomerQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageCustomerQueryCriteria.class
deleted file mode 100644
index e3eeee2..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageCustomerQueryCriteria.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageInfoQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageInfoQueryCriteria.class
deleted file mode 100644
index a798c31..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageInfoQueryCriteria.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.class
similarity index 63%
copy from oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class
copy to oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.class
index 2da6e74..4d71b76 100644
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class
+++ b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderBuyerQueryCriteria.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.class
similarity index 63%
rename from oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class
rename to oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.class
index 2da6e74..9b989ee 100644
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class
+++ b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderLeaveQueryCriteria.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderQueryCriteria.class
deleted file mode 100644
index 7feb386..0000000
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderQueryCriteria.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.class
similarity index 63%
copy from oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class
copy to oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.class
index 2da6e74..fb3b3a8 100644
--- a/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageSellerQueryCriteria.class
+++ b/oying-system/target/classes/com/oying/modules/message/domain/dto/MessageOrderSellerQueryCriteria.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageBuyerMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageBuyerMapper.class
deleted file mode 100644
index 3823ca1..0000000
--- a/oying-system/target/classes/com/oying/modules/message/mapper/MessageBuyerMapper.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageCustomerMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageCustomerMapper.class
deleted file mode 100644
index af7851a..0000000
--- a/oying-system/target/classes/com/oying/modules/message/mapper/MessageCustomerMapper.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageInfoMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageInfoMapper.class
deleted file mode 100644
index a2d4a17..0000000
--- a/oying-system/target/classes/com/oying/modules/message/mapper/MessageInfoMapper.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderBuyerMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderBuyerMapper.class
new file mode 100644
index 0000000..6d00dab
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderBuyerMapper.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderLeaveMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderLeaveMapper.class
new file mode 100644
index 0000000..9d24bae
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderLeaveMapper.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderMapper.class
deleted file mode 100644
index 7d161b6..0000000
--- a/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderMapper.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderSellerMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderSellerMapper.class
new file mode 100644
index 0000000..0979480
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/mapper/MessageOrderSellerMapper.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/mapper/MessageSellerMapper.class b/oying-system/target/classes/com/oying/modules/message/mapper/MessageSellerMapper.class
deleted file mode 100644
index d6dfe44..0000000
--- a/oying-system/target/classes/com/oying/modules/message/mapper/MessageSellerMapper.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageBuyerController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageBuyerController.class
deleted file mode 100644
index 6db4b2d..0000000
--- a/oying-system/target/classes/com/oying/modules/message/rest/MessageBuyerController.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageCustomerController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageCustomerController.class
deleted file mode 100644
index 4e11bc7..0000000
--- a/oying-system/target/classes/com/oying/modules/message/rest/MessageCustomerController.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageInfoController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageInfoController.class
deleted file mode 100644
index 557c773..0000000
--- a/oying-system/target/classes/com/oying/modules/message/rest/MessageInfoController.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderBuyerController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderBuyerController.class
new file mode 100644
index 0000000..7bc61af
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderBuyerController.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderController.class
deleted file mode 100644
index 8b0d9cf..0000000
--- a/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderController.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderLeaveController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderLeaveController.class
new file mode 100644
index 0000000..2022d2d
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderLeaveController.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderSellerController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderSellerController.class
new file mode 100644
index 0000000..309b405
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/rest/MessageOrderSellerController.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageSellerController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageSellerController.class
deleted file mode 100644
index a44f1b4..0000000
--- a/oying-system/target/classes/com/oying/modules/message/rest/MessageSellerController.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/rest/MessageSystemController.class b/oying-system/target/classes/com/oying/modules/message/rest/MessageSystemController.class
index ebd138b..853a5f5 100644
--- a/oying-system/target/classes/com/oying/modules/message/rest/MessageSystemController.class
+++ b/oying-system/target/classes/com/oying/modules/message/rest/MessageSystemController.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageBuyerService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageBuyerService.class
deleted file mode 100644
index 0b366c1..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/MessageBuyerService.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageCustomerService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageCustomerService.class
deleted file mode 100644
index f972bae..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/MessageCustomerService.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageInfoService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageInfoService.class
deleted file mode 100644
index 2258906..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/MessageInfoService.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageOrderBuyerService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderBuyerService.class
new file mode 100644
index 0000000..259ff0e
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderBuyerService.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageOrderLeaveService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderLeaveService.class
new file mode 100644
index 0000000..84c8a4a
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderLeaveService.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageOrderSellerService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderSellerService.class
new file mode 100644
index 0000000..3c32be4
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderSellerService.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageOrderService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageOrderService.class
deleted file mode 100644
index f12638c..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/MessageOrderService.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageSellerService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageSellerService.class
deleted file mode 100644
index ef2e362..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/MessageSellerService.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/MessageSystemService.class b/oying-system/target/classes/com/oying/modules/message/service/MessageSystemService.class
index 2b2e732..eb9d4f1 100644
--- a/oying-system/target/classes/com/oying/modules/message/service/MessageSystemService.class
+++ b/oying-system/target/classes/com/oying/modules/message/service/MessageSystemService.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageBuyerServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageBuyerServiceImpl.class
deleted file mode 100644
index 88b9dbc..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageBuyerServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageCustomerServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageCustomerServiceImpl.class
deleted file mode 100644
index a853db1..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageCustomerServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageInfoServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageInfoServiceImpl.class
deleted file mode 100644
index 3754b04..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageInfoServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.class
new file mode 100644
index 0000000..55c36dc
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderBuyerServiceImpl.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.class
new file mode 100644
index 0000000..5735a7f
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.class
new file mode 100644
index 0000000..4d71a65
--- /dev/null
+++ b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.class
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderServiceImpl.class
deleted file mode 100644
index 65454f6..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageOrderServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSellerServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSellerServiceImpl.class
deleted file mode 100644
index 5d46f09..0000000
--- a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSellerServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSystemServiceImpl.class b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSystemServiceImpl.class
index ba04c45..f18132c 100644
--- a/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSystemServiceImpl.class
+++ b/oying-system/target/classes/com/oying/modules/message/service/impl/MessageSystemServiceImpl.class
Binary files differ
diff --git a/oying-system/target/classes/mapper/message/MessageBuyerMapper.xml b/oying-system/target/classes/mapper/message/MessageBuyerMapper.xml
deleted file mode 100644
index 791578a..0000000
--- a/oying-system/target/classes/mapper/message/MessageBuyerMapper.xml
+++ /dev/null
@@ -1,22 +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.MessageBuyerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageBuyer">
- <id column="buyer_message_id" property="buyerMessageId"/>
- <result column="buyer_id" property="buyerId"/>
- <result column="message_id" property="messageId"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- buyer_message_id, buyer_id, message_id
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_buyer
- <where>
- </where>
- order by buyer_message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/mapper/message/MessageCustomerMapper.xml b/oying-system/target/classes/mapper/message/MessageCustomerMapper.xml
deleted file mode 100644
index b8d5c4a..0000000
--- a/oying-system/target/classes/mapper/message/MessageCustomerMapper.xml
+++ /dev/null
@@ -1,24 +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.MessageCustomerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageCustomer">
- <id column="customer_message_id" property="customerMessageId"/>
- <result column="message_id" property="messageId"/>
- <result column="order_id" property="orderId"/>
- <result column="review_content" property="reviewContent"/>
- <result column="reply_content" property="replyContent"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- customer_message_id, message_id, order_id, review_content, reply_content
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_customer
- <where>
- </where>
- order by customer_message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/mapper/message/MessageInfoMapper.xml b/oying-system/target/classes/mapper/message/MessageInfoMapper.xml
deleted file mode 100644
index ca72391..0000000
--- a/oying-system/target/classes/mapper/message/MessageInfoMapper.xml
+++ /dev/null
@@ -1,27 +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.MessageInfoMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageInfo">
- <id column="message_id" property="messageId"/>
- <result column="message_type" property="messageType"/>
- <result column="title" property="title"/>
- <result column="content" property="content"/>
- <result column="status" property="status"/>
- <result column="created_at" property="createdAt"/>
- <result column="updated_at" property="updatedAt"/>
- <result column="link" property="link"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- message_id, message_type, title, content, status, created_at, updated_at, link
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_info
- <where>
- </where>
- order by message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/mapper/message/MessageOrderBuyerMapper.xml b/oying-system/target/classes/mapper/message/MessageOrderBuyerMapper.xml
new file mode 100644
index 0000000..9235ee3
--- /dev/null
+++ b/oying-system/target/classes/mapper/message/MessageOrderBuyerMapper.xml
@@ -0,0 +1,25 @@
+<?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"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, order_id, message_type, message_content, link, create_time
+ </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/target/classes/mapper/message/MessageOrderLeaveMapper.xml b/oying-system/target/classes/mapper/message/MessageOrderLeaveMapper.xml
new file mode 100644
index 0000000..48b3fbe
--- /dev/null
+++ b/oying-system/target/classes/mapper/message/MessageOrderLeaveMapper.xml
@@ -0,0 +1,25 @@
+<?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"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, order_id, customer_review, seller_reply, link, create_time
+ </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/target/classes/mapper/message/MessageOrderMapper.xml b/oying-system/target/classes/mapper/message/MessageOrderMapper.xml
deleted file mode 100644
index 4b04a77..0000000
--- a/oying-system/target/classes/mapper/message/MessageOrderMapper.xml
+++ /dev/null
@@ -1,22 +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.MessageOrderMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageOrder">
- <id column="order_message_id" property="orderMessageId"/>
- <result column="message_id" property="messageId"/>
- <result column="order_id" property="orderId"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- order_message_id, message_id, order_id
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_order
- <where>
- </where>
- order by order_message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/mapper/message/MessageOrderSellerMapper.xml b/oying-system/target/classes/mapper/message/MessageOrderSellerMapper.xml
new file mode 100644
index 0000000..1150b53
--- /dev/null
+++ b/oying-system/target/classes/mapper/message/MessageOrderSellerMapper.xml
@@ -0,0 +1,25 @@
+<?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="message_type" property="messageType"/>
+ <result column="message_content" property="messageContent"/>
+ <result column="link" property="link"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, order_id, message_type, message_content, link, create_time
+ </sql>
+
+ <select id="findAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from message_order_seller
+ <where>
+ </where>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/mapper/message/MessageSellerMapper.xml b/oying-system/target/classes/mapper/message/MessageSellerMapper.xml
deleted file mode 100644
index 523df49..0000000
--- a/oying-system/target/classes/mapper/message/MessageSellerMapper.xml
+++ /dev/null
@@ -1,22 +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.MessageSellerMapper">
- <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageSeller">
- <id column="seller_message_id" property="sellerMessageId"/>
- <result column="seller_id" property="sellerId"/>
- <result column="message_id" property="messageId"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- seller_message_id, seller_id, message_id
- </sql>
-
- <select id="findAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from message_seller
- <where>
- </where>
- order by seller_message_id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/oying-system/target/classes/mapper/message/MessageSystemMapper.xml b/oying-system/target/classes/mapper/message/MessageSystemMapper.xml
index 3db87d9..b03dca7 100644
--- a/oying-system/target/classes/mapper/message/MessageSystemMapper.xml
+++ b/oying-system/target/classes/mapper/message/MessageSystemMapper.xml
@@ -2,13 +2,13 @@
<!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="system_message_id" property="systemMessageId"/>
- <result column="message_id" property="messageId"/>
- <result column="maintenance_time" property="maintenanceTime"/>
+ <id column="id" property="id"/>
+ <result column="start_time" property="startTime"/>
+ <result column="end_time" property="endTime"/>
</resultMap>
<sql id="Base_Column_List">
- system_message_id, message_id, maintenance_time
+ id, start_time, end_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -17,6 +17,6 @@
from message_system
<where>
</where>
- order by system_message_id desc
+ order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3