release: 晋级阿里云 TEST 后端并修复出车统计 UTC 合并回归 #40

Merged
admin merged 85 commits from release/aliyun-gray-20261106 into main 2026-11-06 12:08:49 +08:00
Showing only changes of commit b95281bacb - Show all commits
@@ -724,7 +724,7 @@ public class ExceptionOrderService {
? List.of("GENERATE_RETURN_INBOUND","CANCEL_EXCEPTION") : List.of("START_PROCESSING", "CANCEL_EXCEPTION");
case "PROCESSING" -> "RETURN".equals(order.getExceptionType()) && "OVERSEAS_WAREHOUSE".equals(order.getReturnDirection()) && workflow.returnOrder(order)==null
? List.of("GENERATE_RETURN_INBOUND") : List.of("COMPLETE_EXCEPTION");
default -> List.of();
default -> List.<String>of();
});
if (java.util.Set.of("PENDING", "PROCESSING").contains(Objects.requireNonNullElse(order.getStatus(), ""))) actions.add("FORCE_CLOSE");
return List.copyOf(actions);