1.开单默认送货方式逻辑修改

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -182,16 +182,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 					areaId = badeRegionAreaId;
 				}
 
-				openOrderVO.setDefaultDeliveryWay("2");
-				Integer typeService = basicdataClientEntity.getTypeService();
-				if (typeService == 1){
-					openOrderVO.setDefaultDeliveryWay("2");
-				}else if(typeService == 2){
-					openOrderVO.setDefaultDeliveryWay("3");
-				}else if(typeService == 3){
-					openOrderVO.setDefaultDeliveryWay("1");
-				}
-
 				openOrderVO.setDeparture(name);
 				openOrderVO.setDepartureCode(areaId);
 				openOrderVO.setDepartureArray(departureArray);
@@ -233,6 +223,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				areaId = badeRegionAreaId;
 			}
 
+
+			openOrderVO.setDefaultDeliveryWay("2");
+			Integer typeService = basicdataClientEntity.getTypeService();
+			if (typeService == 1){
+				openOrderVO.setDefaultDeliveryWay("2");
+			}else if(typeService == 2){
+				openOrderVO.setDefaultDeliveryWay("3");
+			}else if(typeService == 3){
+				openOrderVO.setDefaultDeliveryWay("1");
+			}
+
 			openOrderVO.setDestination(name);
 			openOrderVO.setDestinationCode(areaId);
 			openOrderVO.setDestinationArray(destinationArray);