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

Dev

See merge request quanshu/mp-server!223

mp-quartz/src/main/java/com/qs/mp/quartz/task/TicketBoxTask.java

@@ -53,7 +53,7 @@ public class TicketBoxTask {
   @Autowired
   private ITicketBoxService ticketBoxService;
 
-  private final int PAGE_SIZE = 100;
+  private final int PAGE_SIZE = 1000;
 
   /**
    * 检查票组中奖分布任务

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

@@ -286,7 +286,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
         List<Integer> randomList = getRandomList(excludePkgList, ticketAwards.getQuantity(),
             pkgNum);
         excludePkgList.addAll(randomList);
-        LogUtil.debug(logger, "随机分配到的包序号为:{0}", JSONObject.toJSONString(randomList));
+//        LogUtil.debug(logger, "随机分配到的包序号为:{0}", JSONObject.toJSONString(randomList));
         for (Integer pkgId : randomList) {
           pkgAwardsMap.get(pkgId).add(
               new PkgAwards(ticketAwards.getAwardsId(), ticketAwards.getName(),
@@ -316,8 +316,8 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                   ticketAwards.getSort(), quantity));
         }
       }
-      LogUtil.debug(logger, "奖级{0}分包结果:{1}",
-          k, JSONObject.toJSONString(pkgAwardsMap));
+      /*LogUtil.debug(logger, "奖级{0}分包结果:{1}",
+          k, JSONObject.toJSONString(pkgAwardsMap));*/
     }
     return pkgAwardsMap;
   }