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

优化

See merge request quanshu/mp-server!910

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -321,14 +321,14 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                 oldPrizeIdList.removeAll(prizeIdList);
 
                 if (CollectionUtils.isNotEmpty(oldPrizeIdList)) {
-                    if (TicketTypeEnum.ONLINE.equals(ticketBox.getType())) {
-                        int cashedCount = ticketAwardsPrizeService.count(new LambdaQueryWrapper<TicketAwardsPrize>()
-                            .in(TicketAwardsPrize::getPrizeId, oldPrizeIdList)
-                            .ne(TicketAwardsPrize::getCashedQty, 0));
-                        if (cashedCount != 0) {
-                            throw new ServiceException("包含已兑奖记录的奖品不能从奖级中删除");
-                        }
-                    }
+//                    if (TicketTypeEnum.ONLINE.equals(ticketBox.getType())) {
+//                        int cashedCount = ticketAwardsPrizeService.count(new LambdaQueryWrapper<TicketAwardsPrize>()
+//                            .in(TicketAwardsPrize::getPrizeId, oldPrizeIdList)
+//                            .ne(TicketAwardsPrize::getCashedQty, 0));
+//                        if (cashedCount != 0) {
+//                            throw new ServiceException("包含已兑奖记录的奖品不能从奖级中删除");
+//                        }
+//                    }
 
                     // 删除原来的奖品信息
                     ticketAwardsPrizeService.update(