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

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

@@ -104,7 +104,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 	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");
+    queryWrapper.orderByDesc("t1.created_time").orderByDesc("t1.order_id");
     List<ChannelOrderVO> channelOrderVOList = channelOrderService.selectChannelOrderVoList(queryWrapper);
     for (ChannelOrderVO channelOrderVO : channelOrderVOList) {
     	List<ChannelOrderItem> itemList = channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
@@ -351,7 +351,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 		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");
+	    queryWrapper.orderByDesc("t1.created_time", "t1.order_id");
 
 	    int totalSize = channelOrderService.selectChannelOrderCount(queryWrapper);
 		if (totalSize == 0) {

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

@@ -119,7 +119,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 				queryWrapper.eq("t1.pay_type", PayTypeEnum.WXPAY.getValue());
 			}
 		}
-		queryWrapper.orderByDesc("t1.order_id");
+		queryWrapper.orderByDesc("t1.created_time", "t1.order_id");
 		List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 		for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {
 			QueryWrapper<UserDeliverOrderItemVO> userDeliverOrderItemVOQueryWrapper = new QueryWrapper<>();
@@ -330,7 +330,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 			}
 		}
 
-		queryWrapper.orderByDesc("t1.order_id");
+		queryWrapper.orderByDesc("t1.created_time", "t1.order_id");
 		int totalSize = userDeliverOrderService.selectUserDeliverOrderCount(queryWrapper);
 		if (totalSize == 0) {
 			return AjaxResult.error("没有符合条件的用户提货订单");