From 16ffe6d9a6f5dcb80eb7bea6ee897114ccdcfbe8 Mon Sep 17 00:00:00 2001
From: dmy <muyangdu@163.com>
Date: Thu, 19 Jun 2025 15:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=86=8C=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserOrderByPhoneServiceImpl.java     | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/pangding/web/order/service/user/impl/UserOrderByPhoneServiceImpl.java b/src/main/java/com/pangding/web/order/service/user/impl/UserOrderByPhoneServiceImpl.java
index 3ba5c24e..063a4643 100644
--- a/src/main/java/com/pangding/web/order/service/user/impl/UserOrderByPhoneServiceImpl.java
+++ b/src/main/java/com/pangding/web/order/service/user/impl/UserOrderByPhoneServiceImpl.java
@@ -148,15 +148,7 @@ public class UserOrderByPhoneServiceImpl implements UserOrderByPhoneService {
         PageSizeData<OrderDetailResVo> orderDetailResVoPageSizeData = orderDao.findAlbumOrderList(req);
         List<OrderDetailResVo> list = orderDetailResVoPageSizeData.getList();
         List<String> orderIds = new ArrayList<>();
-        for (OrderDetailResVo orderDetailResVo : list) {
-            orderIds.add(orderDetailResVo.getId());
-        }
-        AlbumCentralEditTaskReqVo taskReqVo = new AlbumCentralEditTaskReqVo();
-        taskReqVo.setOrderIds(orderIds);
-        //查询上传
-        List<AlbumCentralEditTaskResVo> taskList = scenicFeign.editTaskLoad(taskReqVo).check();
-        Set<OrderDetailResVo> resultSet = new HashSet<>();
-        //返回参数需剔除
+        Map<String, OrderDetailResVo> orderMap = new HashMap<>();
         for (OrderDetailResVo orderDetailResVo : list) {
             Date today = DateHelper.getDateTime(DateHelper.getToday());
             Date play = DateHelper.getDateTime(orderDetailResVo.getPlayDate().substring(0, 10) + " 23:59:59");
@@ -164,22 +156,31 @@ public class UserOrderByPhoneServiceImpl implements UserOrderByPhoneService {
             if (DateHelper.compare(play, today) == 1) {
                 continue;
             }
-            if (taskList.size() > 0) {
-                for (AlbumCentralEditTaskResVo taskResVo : taskList) {
-                    if (!StringHelper.isEmpty(taskResVo.getOrderId())
-                            && orderDetailResVo.getId().equals(taskResVo.getOrderId())
-                            && taskResVo.getTaskStatus() == 3) {
-                        continue;
-                    }
-                    resultSet.add(orderDetailResVo);
-                }
-            } else {
-                resultSet.add(orderDetailResVo);
+            if (orderDetailResVo.getOrderStatus() == 2
+                    || orderDetailResVo.getOrderStatus() == 5
+                    || orderDetailResVo.getOrderStatus() == 9) {
+                orderIds.add(orderDetailResVo.getId());
+                orderMap.put(orderDetailResVo.getId(), orderDetailResVo);
             }
         }
-        List<OrderDetailResVo> resultList = new ArrayList<>(resultSet);
+        AlbumCentralEditTaskReqVo taskReqVo = new AlbumCentralEditTaskReqVo();
+        taskReqVo.setOrderIds(orderIds);
+        //查询上传
+        List<AlbumCentralEditTaskResVo> taskList = scenicFeign.editTaskLoad(taskReqVo).check();
+        if (taskList.size() > 0) {
+            for (AlbumCentralEditTaskResVo taskResVo : taskList) {
+                OrderDetailResVo order = orderMap.get(taskResVo.getOrderId());
+                if (!StringHelper.isEmpty(taskResVo.getOrderId())
+                        && !StringHelper.isEmpty(order)
+                        && taskResVo.getTaskStatus() == 3) {
+                    orderMap.remove(order.getId());
+                }
+            }
+        }
+        List<OrderDetailResVo> resultList = new ArrayList<>(orderMap.values());
         orderDetailResVoPageSizeData.setList(resultList);
         return orderDetailResVoPageSizeData;
+
     }