自动派车

src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java

@@ -4981,10 +4981,8 @@ ShipmentManager {
 			    //数量
 			    Double quantity=0d;
 			    //承运商
-			    Long carrierId=legs.get(0).getOrder().getCarrier().getId();
-			    if(carrierId==null){
-			    	carrierId=6070L;//默认一个承运商
-			    }
+			    Long carrierId=legs.get(0).getOrder().getCarrier()==null?6070L:legs.get(0).getOrder().getCarrier().getId();
+			
 			    for(Legs leg:legs){
 			    	weight+=leg.getOrder().getWeight();
 			    	quantity+=leg.getOrder().getQuantity();