Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!725

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -89,11 +89,6 @@ public class ChannelTicketController extends BaseApiController {
     }
     queryWrapper.eq("t1.status", TicketBoxStatusEnum.PUT_ON);
 
-    if (param.getType() != null) {
-      if (TicketTypeEnum.OFFLINE.equals(param.getType())) {
-        queryWrapper.orderByDesc("t1.sort_weight");
-      }
-    }
 
     if (param.getSaleQtySort() != null) {
       if (param.getSaleQtySort() == 1) {
@@ -111,6 +106,8 @@ public class ChannelTicketController extends BaseApiController {
       }
     }
 
+    queryWrapper.orderByDesc("t1.sort_weight");
+
     queryWrapper.nested(wrapper -> {
       wrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());
       if (channelIds.size() != 0) {