From f40b951cf2e8c761e8d501cc6e404c8bf3139103 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 04 十一月 2025 13:15:04 +0800
Subject: [PATCH] 上报次数限定功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderReportStatus.java | 23 +++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 77 +++++++++++++++++---------------------
3 files changed, 59 insertions(+), 44 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 1a4515f..f1424e8 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
@@ -209,7 +209,8 @@
if (result.getCode() == 200) {
return R.ok().add(result.getData());
} else {
- throw new CoolException("淇敼澶辫触锛侊紒");
+ return R.ok(result.getMsg()).add(result.getData());
+// throw new CoolException("淇敼澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderReportStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderReportStatus.java
new file mode 100644
index 0000000..d1d2a0c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderReportStatus.java
@@ -0,0 +1,23 @@
+package com.vincent.rsf.server.manager.enums;
+
+/**
+ * @author Ryan
+ * @date 2025/11/4
+ * @description: 鍗曟嵁涓婃姤鐘舵��
+ * @version 1.0
+ */
+public enum OrderReportStatus {
+ //璐ㄦ鐘舵��
+ ORDER_REPORT_STATUS_UN("0", "鏈笂鎶�"),
+ ORDER_REPORT_STATUS_SECTION("2", "閮ㄥ垎涓婃姤"),
+ ORDER_REPORT_STATUS_ALL("1", "宸蹭笂鎶�"),
+ ;
+
+ OrderReportStatus(String val, String desc) {
+ this.val = Integer.parseInt(val);
+ this.desc = desc;
+ }
+
+ public Integer val;
+ public String desc;
+}
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 79266fe..51263cd 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
@@ -9,10 +9,7 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.enums.OrderWorkType;
-import com.vincent.rsf.server.manager.enums.POExceStatus;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
@@ -115,11 +112,7 @@
* @description: 涓婁紶宸插畬鎴愯鍗曡嚦ERP骞冲彴
* @version 1.0
*/
- public void reportOrders(List<WkOrder> orders) {
- for (WkOrder order : orders) {
- if (order.getReportOnce() > 4 || order.getNtyStatus() == 1) {
- continue;
- }
+ public void reportOrders(WkOrder order) {
ReportParams params = new ReportParams();
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
if (orderItems.isEmpty()) {
@@ -188,23 +181,15 @@
reportData.add(param);
});
params.setData(reportData);
- R reported = reportMsgService.uploadReportOrders(params);
- order.setReportOnce(order.getReportOnce() + 1);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍗曟嵁涓婁紶娆℃暟淇敼澶辫触锛侊紒");
- }
-// if (reported.get("code").equals(200)) {
-// if (!asnOrderService.updateById(order)) {
-// throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-// }
-// }
try {
- //浼戠湢3绉�
- Thread.sleep(3000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ R reported = reportMsgService.uploadReportOrders(params);
+ if (reported.get("code").equals("200")) {
+ order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
+ asnOrderService.updateById(order);
+ }
+ } catch (Exception e) {
+ log.error("<UNK>", e);
}
- }
}
@@ -218,25 +203,28 @@
*/
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
- boolean moveOrder = true;
- //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
- try {
- reportOrders(wkOrders);
- } catch (Exception e) {
- log.error(e.getMessage());
- moveOrder = false;
+ Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, longSet));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
- //鍒ゆ柇鏄惁鎶涘嚭寮傚父锛屾姏寮傚父涓嶅仛绉诲嚭鍔ㄤ綔
- if (moveOrder) {
- Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .in(WkOrderItem::getOrderId, longSet));
- if (orderItems.isEmpty()) {
- throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
+ for (WkOrder order : wkOrders) {
+ try {
+ //涓婃姤娆℃暟闄愬畾
+ if (order.getReportOnce() < 4 ) {
+ //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
+ reportOrders(order);
+ order.setReportOnce(order.getReportOnce() + 1);
+ if (!asnOrderService.updateById(order)) {
+ log.error(order.getCode() + "锛屽崟鎹笂浼犳鏁颁慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
-
- for (WkOrder order : wkOrders) {
+ if (order.getNtyStatus().equals(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val)) {
AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
if (Objects.isNull(one)) {
AsnOrderLog orderLog = new AsnOrderLog();
@@ -327,10 +315,13 @@
if (!this.asnOrderService.removeById(order.getId())) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
+ try {
+ //浼戠湢3绉�
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}
}
-
}
-
-
}
--
Gitblit v1.9.1