Merge branch 'dev' of maopiao/mp-server into mp-server-test

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

@@ -422,14 +422,9 @@ public class UserTicketController extends BaseApiController {
         if (ticketPackage.getStatus() == TicketPkgStatusEnum.FOR_SALE) {
             LogUtil.warn(logger, "盲票未激活。sn:{0},pkgId:{1}", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
             return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
-        }else if(ticketPackage.getStatus() == TicketPkgStatusEnum.STOP){
-            LogUtil.warn(logger, "盲票已停售。sn:{0},pkgId:{1}", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
-            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
         }
-
         ChannelOrderDetail channelOrderDetail = channelOrderDetailService.getOne(
             new LambdaQueryWrapper<ChannelOrderDetail>().eq(ChannelOrderDetail::getPkgId, ticketPackage.getPkgId()));
-
         TicketVO ticketVO = new TicketVO();
         ticketVO.setPrizeList(ticketAwardsPrizeService.listPrizeVO(ticket.getBoxId()));
         ticketVO.setTicketId(ticket.getTicketId());
@@ -444,7 +439,6 @@ public class UserTicketController extends BaseApiController {
         if (channelOrderDetail != null) {
             ticketVO.setChannelId(channelOrderDetail.getChannelId());
         }
-
         // 设置奖项名
         if (Objects.nonNull(ticket.getPlainLuckyNum())) {
             List<TicketDrawNumDTO> drawNumDTOList = JSONObject.parseArray(ticket.getDrawNum(), TicketDrawNumDTO.class);