20220810

xiaoyong931011

2022-08-11 2cb2669a13dd6cd043f17b7a10a090110cbe674f

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -140,8 +140,9 @@
                continue;
//                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
            Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
            Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status || 2 != deliveryState){
                continue;
//                return new FebsResponse().fail().message("订单不是待确认到货状态");
            }