Merge branch 'dev' into mp-server-test

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

@@ -462,6 +462,14 @@ public class UserTicketController extends BaseApiController {
             }else{
                 ajaxResult = queryLuckyNumTrue(ticketPackage, ticket, ticketBox);
             }
+        }else if(ticketPackage.getStatus() == TicketPkgStatusEnum.STOP){
+            if(ticketBox.getStatus().equals(TicketBoxStatusEnum.STOP)){
+                if(ticket.getStatus().equals(TicketStatusEnum.NOT_PAY)){
+                    LogUtil.warn(logger, "该盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
+                    return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
+                }
+                ajaxResult = queryLuckyNumTrue(ticketPackage,ticket,ticketBox);
+            }
         }
         return ajaxResult;
     }