渠道订单查询

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

@@ -60,13 +60,13 @@ public class ChannelOrderMgrController extends BaseApiController {
 
   @Autowired
   private IChannelOrderDetailService channelOrderDetailService;
-  
-  @Autowired 
+
+  @Autowired
   private IChannelService channelService;
-  
-  @Autowired 
+
+  @Autowired
   private IDeliveryCompanyService deliveryCompanyService;
-  
+
   @Autowired
   private ITicketPackageService ticketPackageService;
 
@@ -85,8 +85,8 @@ public class ChannelOrderMgrController extends BaseApiController {
     queryWrapper.eq(null != queryParam && null != queryParam.getChannelId(), "t1.channel_id" ,queryParam.getChannelId());
     queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id" ,queryParam.getOrderId());
 	queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`status`" ,queryParam.getStatus());
-	queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(),  "t1.create_time", queryParam.getStartTime());
-	queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.create_time", queryParam.getEndTime());
+	queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(),  "t1.created_time", queryParam.getStartTime());
+	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");
     List<ChannelOrderVO> channelOrderVOList = channelOrderService.selectChannelOrderVoList(queryWrapper);
@@ -112,7 +112,7 @@ public class ChannelOrderMgrController extends BaseApiController {
     	return error(ErrorCodeEnum.ERROR_CODE_1001);
     }
     ChannelOrderInfoVO channelOrderInfoVO = mapperFacade.map(channelOrder, ChannelOrderInfoVO.class);
-    
+
     if(null != channelOrderInfoVO && null != channelOrderInfoVO.getChannelId()) {
     	Channel channel = channelService.getById(channelOrderInfoVO.getChannelId());
     	channelOrderInfoVO.setChannel(channel);
@@ -123,7 +123,7 @@ public class ChannelOrderMgrController extends BaseApiController {
     }
     List<ChannelOrderItem> itemList = channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
 	          .eq(ChannelOrderItem::getOrderId, channelOrderInfoVO.getOrderId()));
-	
+
 	List<ChannelOrderItemVO> itemVOList = mapperFacade.mapAsList(itemList, ChannelOrderItemVO.class);
 	if(null != itemVOList && itemVOList.size() > 0) {
 		for(ChannelOrderItemVO itemVO : itemVOList) {
@@ -140,7 +140,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 	channelOrderInfoVO.setItems(itemVOList);
     return AjaxResult.success(channelOrderInfoVO);
   }
-  
+
 
   /**
    * 订单发货
@@ -153,13 +153,13 @@ public class ChannelOrderMgrController extends BaseApiController {
 		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		
+
 		ChannelOrder order  = channelOrderService.getById(shipParam.getOrderId());
-		if(null == order || StringUtils.isBlank(order.getOrderId()) 
+		if(null == order || StringUtils.isBlank(order.getOrderId())
 				|| null == order.getChannelId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		
+
 		if(null != shipParam && null != shipParam.getPkgIds()
 				&& shipParam.getPkgIds().size() > 0) {
 			ChannelOrder channelOrder = new ChannelOrder();
@@ -173,7 +173,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 		}
 		return AjaxResult.error("发货失败");
   }
-  
+
 	@PostMapping("/item/list")
 	@ApiOperation(value = "获取经销商订单盲票组列表", notes = "")
 	public AjaxResult list(@RequestBody ChannelOrder order) {