Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java

@@ -202,8 +202,12 @@ public class WaybillCheckListener {
 		Integer serviceType = waybillEntity.getServiceType();
 		BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(consigneeId);
 		if(!Objects.isNull(basicdataClient)){
-			serviceType=basicdataClient.getTypeService();
+			Integer typeService = basicdataClient.getTypeService();
+			if(!Objects.isNull(typeService)){
+				serviceType=basicdataClient.getTypeService();
+			}
 		}
+
 		String payWay = waybillEntity.getPayWay();
 		Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
 		String departureWarehouseName = waybillEntity.getDepartureWarehouseName();
@@ -492,8 +496,13 @@ public class WaybillCheckListener {
 			Integer serviceType = waybillEntity.getServiceType();
 			BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(consigneeId);
 			if(!Objects.isNull(basicdataClient)){
-				serviceType=basicdataClient.getTypeService();
+				Integer typeService = basicdataClient.getTypeService();
+				if(!Objects.isNull(typeService)){
+					serviceType=basicdataClient.getTypeService();
+				}
 			}
+
+
 			String payWay = waybillEntity.getPayWay();
 			Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
 			String departureWarehouseName = waybillEntity.getDepartureWarehouseName();