修改

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -371,11 +371,16 @@ public class OrderServiceImpl implements OrderService {
         OrderEntity orderEntity = queryObject(id);
         if (orderEntity == null) {
             throw new RRException("此订单不存在！");
-        } else if (orderEntity.getShippingStatus() == 0 ||
-                (StringUtils.isNullOrEmpty(orderEntity.getShippingNo()) &&
-                        !(orderEntity.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_00.getItem())
-                                || orderEntity.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_02.getItem())))) {
-            throw new RRException("此订单还未发货！");
+        }
+        if(orderEntity.getShippingStatus() == 0){
+            if(orderEntity.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_00.getItem())
+                    || orderEntity.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_02.getItem())){
+                throw new RRException("此订单还未发货！");
+            }else{
+                if (StringUtils.isNullOrEmpty(orderEntity.getShippingNo())) {
+                    throw new RRException("此订单还未发货！");
+                }
+            }
         }
 
         Map logisticsInfo = new HashMap();