bug312 APP/WEB控货订单下载提单添加限制条件

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -3889,14 +3889,16 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         }
         // 判断发货人是否是当前登录人
         Long customerId = dto.getConsignorVO().getCustomerId();
-        List<CustomerContactsDO> consigneeCustomerList = customerContactsService.getCustomerContactsListByCustomerId(customerId);
-        CustomerContactsDO customerContactsDO = consigneeCustomerList.stream().filter(val -> Objects.equals(val.getIsDefault(), 1)).findFirst().orElse(null);
+        String phone = dto.getConsignorVO().getPhone();
+        List<CustomerContactsDO> consignorCustomerList = customerContactsService.getCustomerContactsListByCustomerId(customerId);
+        CustomerContactsDO customerContactsDO = consignorCustomerList.stream().filter(val -> Objects.equals(val.getPhoneNew(), phone)).findFirst().orElse(null);
         if (Objects.equals(customerContactsDO.getPhoneNew(),user.getMobile())){
             return success(true);
         }
         Long customerId1 = dto.getConsigneeVO().getCustomerId();
-        List<CustomerContactsDO> consignorCustomerList1 = customerContactsService.getCustomerContactsListByCustomerId(customerId1);
-        CustomerContactsDO customerContactsDO1 = consignorCustomerList1.stream().filter(val -> Objects.equals(val.getIsDefault(), 1)).findFirst().orElse(null);
+        String phone1 = dto.getConsigneeVO().getPhone();
+        List<CustomerContactsDO> consigneeCustomerList = customerContactsService.getCustomerContactsListByCustomerId(customerId1);
+        CustomerContactsDO customerContactsDO1 = consigneeCustomerList.stream().filter(val -> Objects.equals(val.getPhoneNew(), phone1)).findFirst().orElse(null);
         List<OrderControlLogDO> orderControlLogListByOrderIdList = orderControlLogService.getOrderControlLogListByOrderId(orderId, null);
         boolean isFirstAllAllow = false;
         int count = 0; // 新增计数器