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

查看兑奖奖品

See merge request quanshu/mp-server!896

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

@@ -510,11 +510,11 @@ public class UserTicketController extends BaseApiController {
         }
 
         // 线上盲票不支持查看兑奖奖品
-        TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
-        if (TicketTypeEnum.ONLINE.equals(ticketBox.getType())) {
-            LogUtil.error(logger, "线上盲票不支持查看兑奖奖品。ticketId:{0}", ticket.getTicketId());
-            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1000);
-        }
+//        TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
+//        if (TicketTypeEnum.ONLINE.equals(ticketBox.getType())) {
+//            LogUtil.error(logger, "线上盲票不支持查看兑奖奖品。ticketId:{0}", ticket.getTicketId());
+//            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1000);
+//        }
 
         List<TicketAwardsPrize> ticketAwardsPrizes = userHitPrizeService.listPrize(ticket, userId);
         JSONObject jsonObject = new JSONObject();