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

优化

See merge request quanshu/mp-server!898

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

@@ -510,7 +510,7 @@ public class UserTicketController extends BaseApiController {
         }
 
         // 线上盲票不支持查看兑奖奖品
-//        TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
+        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);
@@ -521,6 +521,7 @@ public class UserTicketController extends BaseApiController {
         jsonObject.put("prizeList", ticketAwardsPrizes);
         jsonObject.put("ticketId", ticket.getTicketId());
         jsonObject.put("boxId", ticket.getBoxId());
+        jsonObject.put("type", ticketBox.getType());
         return AjaxResult.success(jsonObject);
     }