From a422cb5b73799050827251f835ebc53d5757a96b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 24 一月 2026 09:06:21 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
index 6fc3a82..2042e15 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
@@ -3,6 +3,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
+import com.vincent.rsf.server.api.entity.validator.SyncOrderValidator;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -91,14 +92,14 @@
/**
* @author Ryan
* @date 2025/8/19
- * @description: 鍚屾鐩樼偣鍗曟嵁
+ * @description: 鏀惰揣閫氱煡鍗曞悓姝�
* @version 1.0
*/
@ApiOperation("鍚屾鍗曟嵁")
@OperationLog("鍗曟嵁鍚屾")
@PostMapping("/sync/checks")
- public R syncCheckResult(@RequestBody SyncOrderParams syncOrders) {
- if (Objects.isNull(syncOrders)) {
+ public R syncCheckResult(@RequestBody List<SyncOrderParams> syncOrders) {
+ if (Objects.isNull(syncOrders) || syncOrders.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return receiveMsgService.syncCheckOrder(syncOrders, getLoginUserId());
@@ -160,11 +161,21 @@
@ApiOperation("鍗曟嵁淇敼")
@OperationLog("鍗曟嵁淇敼")
@PostMapping("/sync/orders/update")
- public R syncOrderUpdate(@RequestBody SyncOrderParams orders) {
- if (Objects.isNull(orders)) {
+ public R syncOrderUpdate(@RequestBody List<SyncOrderParams> orders) {
+ if (Objects.isNull(orders) || orders.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return receiveMsgService.syncOrderUpdate(orders);
+ try {
+ // 涓氬姟楠岃瘉
+ new SyncOrderValidator().validateBatchOrders(orders);
+
+ // 澶勭悊涓氬姟
+ return receiveMsgService.syncCheckOrder(orders, getLoginUserId());
+ } catch (IllegalArgumentException e) {
+ return R.error(e.getMessage());
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
}
--
Gitblit v1.9.1