菠萝派接口-发货接口修改

@@ -43,10 +43,9 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
             throw new BizException(String.format("订单发货，获取订单数据业务异常:[%s]",callRequest.getBizModel().getPlatOrderNo()));
         }
         //只有订单状态为12345可以允许修改快递单号，其中状态为123可以修改地址，发货时间，订单状态，其他订单状态直接报业务异常
-       if(orders.getOrderState().intValue() != EJavaShopOrderStateEnum.RefundFail.getCode()){
+       if(orders.getOrderState().intValue() != EJavaShopOrderStateEnum.RefundFail.getCode() && orders.getOrderState().intValue() != EJavaShopOrderStateEnum.WaitPay.getCode()){
 
-            if(orders.getOrderState().intValue() == EJavaShopOrderStateEnum.WaitPay.getCode()
-                    || orders.getOrderState().intValue() == EJavaShopOrderStateEnum.WaitConfirmed.getCode()
+            if(orders.getOrderState().intValue() == EJavaShopOrderStateEnum.WaitConfirmed.getCode()
                     || orders.getOrderState().intValue() == EJavaShopOrderStateEnum.WaitShip.getCode()){
 
                 //订单状态
@@ -64,10 +63,10 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
 
            }
 
+           if(!StringUtil.isNull(callRequest.getBizModel().getLogisticNo())){
                //判断该快递订单号是否存在，已存在就不允许把该快递订单号添加进去
                 int num = pineappleDao.checkLogisticsNumber(params);
                 if(num == 0){
-                if(!StringUtil.isNull(callRequest.getBizModel().getLogisticNo())){
                     if(StringUtil.isNull(orders.getLogisticsNumber())){
                         params.put("logisticsNumber",callRequest.getBizModel().getLogisticNo());
                     }else{