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

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

@@ -491,6 +491,9 @@ public class TicketBoxMgrController extends BaseApiController {
             return AjaxResult.error("参数缺失");
         }
         TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
+        if (null == ticketBox) {
+            return AjaxResult.error("参数异常，盲票组不存在");
+        }
         //更新盲票列表的状态
         List<Ticket> ticketList = ticketService
             .list(new LambdaQueryWrapper<Ticket>().eq(Ticket::getBoxId, ticketBox.getBoxId()));
@@ -501,14 +504,16 @@ public class TicketBoxMgrController extends BaseApiController {
             ticketBoxService.update(new LambdaUpdateWrapper<TicketBox>()
                 .set(TicketBox::getStatus, TicketBoxStatusEnum.STOP)
                 .eq(TicketBox::getBoxId, ticketBox.getBoxId()));
-            for(Ticket ticket : ticketList){
-                ticket.setStatus(TicketStatusEnum.STOP);
-                ticketService.saveOrUpdate(ticket);
-            }
             for(TicketPackage ticketPackage : ticketPackageList){
                 ticketPackage.setStatus(TicketPkgStatusEnum.STOP);
                 ticketPackageService.saveOrUpdate(ticketPackage);
             }
+            for(Ticket ticket : ticketList){
+                if(ticket.getStatus().equals(TicketStatusEnum.NOT_PAY)){
+                    ticket.setStatus(TicketStatusEnum.STOP);
+                    ticketService.saveOrUpdate(ticket);
+                }
+            }
         }else {
             return AjaxResult.error("当前不是已上架的线下盲票，不能进行停售操作");
         }