From 8c5b4882879c11321e1a0e18bb1c2c89f34e8c45 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 01 十一月 2025 21:48:48 +0800
Subject: [PATCH] 上报次数修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 16 +++++++++-------
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 15ec4c4..1a4515f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -71,8 +71,10 @@
* @author Ryan
* @description 涓婃姤璐ㄦ鍒楄〃
* @params [items 鍒楄〃]
+ *
* @return boolean
* @time 2025/3/7 09:12
+ * 11
*/
@Override
@Transactional(rollbackFor = Exception.class)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index 968131f..adb5088 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -113,6 +113,9 @@
@ApiModelProperty("涓婃姤鐘舵�� 0锛氭湭涓婃姤, 1锛氬凡涓婃姤")
private Integer ntyStatus;
+ @ApiModelProperty("涓婃姤娆℃暟")
+ private Integer reportOnce;
+
/**
* 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index d34d0d0..1e5c288 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -116,7 +116,10 @@
*/
@Transactional(rollbackFor = Exception.class)
public void reportOrders(List<WkOrder> orders) {
- orders.forEach(order -> {
+ for (WkOrder order : orders) {
+ if (order.getReportOnce() > 4) {
+ continue;
+ }
ReportParams params = new ReportParams();
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
if (orderItems.isEmpty()) {
@@ -188,10 +191,10 @@
R reported = reportMsgService.uploadReportOrders(params);
if (reported.get("code").equals(200)) {
- order.setNtyStatus(1);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+ order.setNtyStatus(1);
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
try {
//浼戠湢3绉�
@@ -199,8 +202,7 @@
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
-
- });
+ }
}
--
Gitblit v1.9.1