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 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
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("更新失败");
-// }
+
}
--
Gitblit v1.9.3