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

盲票奖品数量

See merge request quanshu/mp-server!900

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

@@ -232,10 +232,10 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                     awardsPrize.setPrizeId(bizIdGenerator.newId());
                     awardsPrize.setBoxId(ticketBox.getBoxId());
                     awardsPrize.setAwardsId(ticketAwardsParam.getAwardsId());
-                    if (TicketTypeEnum.OFFLINE.equals(ticketBox.getType())) {
+//                    if (TicketTypeEnum.OFFLINE.equals(ticketBox.getType())) {
                         // 线下票的则默认为整个奖项的数量
                         awardsPrize.setQuantity(ticketAwardsParam.getQuantity());
-                    }
+//                    }
                     awardsPrize.setRemainQty(awardsPrize.getQuantity());
                     awardsPrize.setCashedQty(0);
                     if (ticketAwardsPrizeParam.getPrizeType() == TicketPrizeTypeEnum.GOODS) {
@@ -436,10 +436,10 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                 awardsPrize.setPrizeId(bizIdGenerator.newId());
                 awardsPrize.setBoxId(ticketBox.getBoxId());
                 awardsPrize.setAwardsId(ticketAwards.getAwardsId());
-                if (TicketTypeEnum.OFFLINE.equals(ticketBox.getType())) {
+//                if (TicketTypeEnum.OFFLINE.equals(ticketBox.getType())) {
                     // 线下票的则默认为整个奖项的数量
                     awardsPrize.setQuantity(ticketAwards.getQuantity());
-                }
+//                }
                 awardsPrize.setRemainQty(awardsPrize.getQuantity());
                 awardsPrize.setCashedQty(0);
                 if (prizeParam.getPrizeType() == TicketPrizeTypeEnum.GOODS) {