提货异常问题修改

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java

@@ -25,6 +25,7 @@ import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto;
 import cn.iocoder.yudao.module.order.enums.*;
 import cn.iocoder.yudao.module.order.service.order.*;
 import cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService;
+import cn.iocoder.yudao.module.order.vo.orderConsignee.OrderConsigneeBackVO;
 import cn.iocoder.yudao.module.order.vo.orderPickup.*;
 import cn.iocoder.yudao.module.order.vo.orderTime.OrderTimeQueryVO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
@@ -622,8 +623,9 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
                 Long aLong = orderPickupMapper.selectCount(OrderPickupDO::getOrderId, createReqVO.getOrderId());
                 OrderDO order = orderService.selectOne(OrderDO::getOrderNo, createReqVO.getOrderId());
                 OrderBackInfoDto orderDO = orderQueryService.info(order.getOrderId());
-
-                if (orderDO.getConsigneeVO() == null || orderDO.getConsigneeVO().getHarvestMethod() == 2) {
+                OrderConsigneeBackVO consigneeVO = orderDO.getConsigneeVO();
+                Integer harvestMethod = consigneeVO == null ? orderDO.getHarvestMethod() : consigneeVO.getHarvestMethod();
+                if (Objects.isNull(harvestMethod) || harvestMethod == 2) {
                     if (StringUtils.isNotBlank(orderDO.getTidanNo())) {
                         errorOrderNo.add(orderDO.getOrderNo() + "(" + orderDO.getTidanNo() + ")");
                     } else {