去除兼容处理，shipParam.getDeliveryType()

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelOrderMgrController.java

@@ -177,12 +177,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 				|| null == order.getChannelId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-
-	  Integer deliveryType = shipParam.getDeliveryType();
-	  if (null == deliveryType) {
-		  deliveryType = 1;
-	  }
-
+		Integer deliveryType = shipParam.getDeliveryType();
 	  if (DeliverTypeEnum.DELIVER.getValue().equals(deliveryType)) {
 		  if (Objects.isNull(shipParam.getDeliveryId())) {
 			  return AjaxResult.error("快递公司不能为空");
@@ -322,9 +317,9 @@ public class ChannelOrderMgrController extends BaseApiController {
 		}
 		return AjaxResult.success(list);
 	}
-	
-	
-	
+
+
+
 	@Log(title = "提货订单导出", businessType = BusinessType.EXPORT)
 	@PostMapping("/export")
 	@PreAuthorize("@ss.hasPermi('order:channel:export')")
@@ -341,12 +336,12 @@ public class ChannelOrderMgrController extends BaseApiController {
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t1.title", queryParam.getTitle());
 	    queryWrapper.orderByDesc("t1.order_id");
-	    
+
 	    int totalSize = channelOrderService.selectChannelOrderCount(queryWrapper);
 		if (totalSize == 0) {
 			return AjaxResult.error("没有符合条件的经销商订单");
 		}
-	    
+
 		int pageSize = 2000;
 		if (totalSize > pageSize) {
 			int totalPage = totalSize % pageSize == 0 ? totalSize / pageSize : totalSize / pageSize + 1;
@@ -396,7 +391,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 			  	channelOrderVO.setItems(itemVOList);
 		    }
 		}
-	    
+
 		if (null != listAll && listAll.size() > 0) {
 			// listAll.sort(Comparator.comparing(UserDeliverOrderVO::getOrderId));
 			for (ChannelOrderVO channelOrder : listAll) {