From 3caa0b05a620aa7714de0d63c804e43aa6486c9b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java | 14 +++----
oying-system/src/main/java/com/oying/modules/message/service/MessageOrderSellerService.java | 26 +++++++++++++
oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java | 6 +-
oying-system/src/main/java/com/oying/modules/message/mapper/MessageOrderSellerMapper.java | 2 +
oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderSellerServiceImpl.java | 30 +++++++++++++++
oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml | 22 +++++++++++
6 files changed, 89 insertions(+), 11 deletions(-)
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
index 763f274..d39132a 100644
--- 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
@@ -26,9 +26,9 @@
@ApiModelProperty(value = "id")
private Integer id;
-
+ // 订单id String
@ApiModelProperty(value = "orderId")
- private Integer orderId;
+ private String orderId;
@ApiModelProperty(value = "storeId")
@@ -46,7 +46,7 @@
@ApiModelProperty(value = "link")
private String link;
-
+ //0未读 1已读
@ApiModelProperty(value = "flag")
private Integer flag=0;
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
index 2fd121f..510e800 100644
--- 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
@@ -23,4 +23,6 @@
List<MessageOrderSeller> findByStoreId(String storeId);
Boolean updateMessageOrderSellerRead(Integer orderId);
+
+ boolean saveMessageOrderSellerByOrderIdAndStoreId(MessageOrderSeller resources);
}
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
index 6fcf7d7..e73785e 100644
--- 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
@@ -10,6 +10,8 @@
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import java.util.List;
+
+import org.apache.poi.util.Beta;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -111,20 +113,16 @@
}
-
+ @Beta//重复值处理
//让后端队友更新我的表
@PostMapping("/update/seller")
- @ApiOperation("让后端队友更新消息表")
+ @ApiOperation("更新插入消息表")
public R<String> updateMessageOrderSeller(@RequestBody MessageOrderSeller resources) {
//插入一条数据
- if(messageOrderSellerService.saveOrUpdate(resources))
+ if(messageOrderSellerService.saveMessageOrderSellerByOrderIdAndStoreId(resources))
return R.success("更新成功");
return R.fail("更新失败");
-// if(messageOrderSellerService.updateById(resources)){
-// return R.success("更新成功");
-// }else{
-// return R.fail("更新失败");
-// }
+
}
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
index c4e5361..ca3615e 100644
--- 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
@@ -1,5 +1,6 @@
package com.oying.modules.message.service;
+import com.google.common.annotations.Beta;
import com.oying.modules.message.domain.MessageOrderSeller;
import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
@@ -62,4 +63,29 @@
List<MessageOrderSeller> findByStoreId(String storeId);
boolean updateMessageOrderSellerRead(Integer orderId);
+
+ /**
+ * 保存或更新 MessageOrderSeller 记录。
+ * <p>
+ * 该方法根据传入的 MessageOrderSeller 对象，将数据插入到数据库中。
+ * 如果记录已存在，则更新；如果不存在，则插入新记录。
+ * </p>
+ * <p>
+ * 必须字段：
+ * - orderId：订单 ID
+ * - storeId：店铺 ID
+ * </p>
+ * <p>
+ * 可选字段：
+ * - messageType：消息类型 ： 供流程使用 订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消"
+ * - messageContent：消息内容 ： "订单已提交" :"支付成功" 商家已接单 骑手已接单"
+ * - link：链接
+ * - flag：标志字段（默认值为未读 0）
+ * </p>
+ *
+ * @param resources MessageOrderSeller 对象，包含需要保存或更新的数据。
+ * @return true 表示保存成功，false 表示保存失败。
+ */
+ @Beta
+ boolean saveMessageOrderSellerByOrderIdAndStoreId(MessageOrderSeller resources);
}
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
index 25d8344..d5fc522 100644
--- 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
@@ -9,6 +9,7 @@
import com.oying.modules.message.service.MessageOrderSellerService;
import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
import com.oying.modules.message.mapper.MessageOrderSellerMapper;
+import org.apache.poi.util.Beta;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.oying.utils.PageUtil;
@@ -89,4 +90,33 @@
public boolean updateMessageOrderSellerRead(Integer orderId) {
return messageOrderSellerMapper.updateMessageOrderSellerRead(orderId);
}
+
+ /**
+ * 保存或更新 MessageOrderSeller 记录。
+ * <p>
+ * 该方法根据传入的 MessageOrderSeller 对象，将数据插入到数据库中。
+ * 如果记录已存在，则更新；如果不存在，则插入新记录。
+ * </p>
+ * <p>
+ * 必须字段：
+ * - orderId：订单 ID
+ * - storeId：店铺 ID
+ * </p>
+ * <p>
+ * 可选字段：
+ * - messageType：消息类型 ： 供流程使用 订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消"
+ * - messageContent：消息内容 ： "订单已提交" :"支付成功" 商家已接单 骑手已接单"
+ * - link：链接
+ * - flag：标志字段（默认值为未读 0）
+ * </p>
+ *
+ * @param resources MessageOrderSeller 对象，包含需要保存或更新的数据。
+ * @return true 表示保存成功，false 表示保存失败。
+ */
+ @Beta
+ @Override
+ public boolean saveMessageOrderSellerByOrderIdAndStoreId(MessageOrderSeller resources) {
+ return messageOrderSellerMapper.saveMessageOrderSellerByOrderIdAndStoreId(resources);
+ }
+
}
diff --git a/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml b/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml
index 5bccf2c..5af3eb5 100644
--- a/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml
+++ b/oying-system/src/main/resources/mapper/message/MessageOrderSellerMapper.xml
@@ -19,6 +19,26 @@
id, order_id,store_id, message_type, message_content, link, create_time, update_time, create_by, update_by,flag
</sql>
+ <insert id="saveMessageOrderSellerByOrderIdAndStoreId" parameterType="com.oying.modules.message.domain.MessageOrderSeller">
+ # 动态sql 必须插入 order_id store_id 其他字段可以选择性插入 flag默认插入0
+ <!-- 动态 SQL：必须插入 order_id 和 store_id -->
+ <!-- 其他字段可以选择性插入 -->
+ INSERT INTO message_order_seller (
+ order_id,
+ store_id,
+ <if test="messageType != null">message_type,</if>
+ <if test="messageContent != null">message_content,</if>
+ <if test="link != null">link,</if>
+ flag
+ ) VALUES (
+ #{orderId},
+ #{storeId},
+ <if test="messageType != null">#{messageType},</if>
+ <if test="messageContent != null">#{messageContent},</if>
+ <if test="link != null">#{link},</if>
+ 0
+ )
+ </insert>
<select id="findAll" resultMap="BaseResultMap">
select
@@ -43,4 +63,6 @@
set flag = 1
where order_id = #{orderId}
</update>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3