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

优化

See merge request quanshu/mp-server!473

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

@@ -331,9 +331,7 @@ public class UserTicketController extends BaseApiController {
     // 增加兑奖信息并且按时间排序
     ticketHitPrizeBarrageVOList.addAll(exchangeList);
 
-    ticketHitPrizeBarrageVOList.sort(Comparator.comparing(TicketHitPrizeBarrageVO::getCreatedTime));
-
-
+    ticketHitPrizeBarrageVOList.sort((o1, o2) -> o2.getCreatedTime().compareTo(o1.getCreatedTime()));
 
     // 获取除该用户外，近 6 个月，8 条高级中奖弹幕信息
     List<TicketHitPrizeBarrageVO> expensiveHitPrizeBarrageList = userHitPrizeService.expensiveHitPrizeBarrage(userId);

mp-service/src/main/java/com/qs/mp/admin/domain/excel/UserTicketOrderExcel.java

@@ -31,17 +31,18 @@ public class UserTicketOrderExcel {
     @Excel(name = "盲票类型")
     private String boxType;
 
+    @Excel(name = "盲票售价")
+    private Integer salePrice;
+
     @Excel(name = "购买数量")
     private Integer ticketNum;
 
-    @Excel(name = "盲票售价")
-    private Integer salePrice;
+    @Excel(name = "优惠金额")
+    private Integer discountAmt;
 
     @Excel(name = "支付金额")
     private Integer payAmt;
 
-    @Excel(name = "优惠金额")
-    private Integer discountAmt;
 
     @Excel(name = "用户昵称")
     private String nickName;