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

Dev

See merge request quanshu/mp-server!690

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

@@ -398,7 +398,6 @@ public class UserTicketController extends BaseApiController {
 
     // 弹幕列表
     List<TicketHitPrizeBarrageVO> listOne = new ArrayList<>();
-    List<TicketHitPrizeBarrageVO> listTwo = new ArrayList<>();
 
     // 获取除当前用户外最近10条盲豆大于1000的商品兑换数据
     QueryWrapper<TicketHitPrizeBarrageVO> queryWrapper = new QueryWrapper<>();
@@ -441,11 +440,9 @@ public class UserTicketController extends BaseApiController {
           // 设置类型为中奖
           ticketHitPrizeBarrageVOList.get(i).setType(1);
 
-          if (i % 2 == 0) {
-            listOne.add(ticketHitPrizeBarrageVOList.get(i));
-          }else {
-            listTwo.add(ticketHitPrizeBarrageVOList.get(i));
-          }
+
+          listOne.add(ticketHitPrizeBarrageVOList.get(i));
+
         }
       }
     }
@@ -484,24 +481,18 @@ public class UserTicketController extends BaseApiController {
       if (count != 0 && i % 5 == 0) {
         // 设置类型为中奖
         expensiveHitPrizeBarrageList.get(index).setType(1);
-        if (index % 2 == 0) {
-          listOne.add(expensiveHitPrizeBarrageList.get(index));
-        }else {
-          listTwo.add(expensiveHitPrizeBarrageList.get(index));
-        }
+        listOne.add(expensiveHitPrizeBarrageList.get(index));
+
         count--;
         index++;
       }
 
-      if (i % 2 == 0) {
-        listOne.add(ticketHitPrizeBarrageVOList.get(i));
-      }else {
-        listTwo.add(ticketHitPrizeBarrageVOList.get(i));
-      }
+
+      listOne.add(ticketHitPrizeBarrageVOList.get(i));
+
     }
     Map<String,List<TicketHitPrizeBarrageVO>> ticketHitPrizeBarrageMap = new HashMap<>();
     ticketHitPrizeBarrageMap.put("listOne",listOne);
-    ticketHitPrizeBarrageMap.put("listTwo",listTwo);
 
     return AjaxResult.success(ticketHitPrizeBarrageMap);
   }

mp-framework/src/main/java/com/qs/mp/framework/monitor/SendErrorMsgAppender.java

@@ -29,7 +29,9 @@ public class SendErrorMsgAppender extends UnsynchronizedAppenderBase<ILoggingEve
         String throwableMsg = throwable.getMessage();
         if (StringUtils.isNotBlank(throwableMsg) && (throwableMsg.startsWith("验证码失效") || throwableMsg.startsWith("重复购买，请稍后再试")
         || throwableMsg.startsWith("盲票已付款，") || throwableMsg.startsWith("盲票已兑奖") || throwableMsg.startsWith("登录用户不存在：")
-        || throwableMsg.startsWith("用户不存在/密码错误") || throwableMsg.startsWith("验证码已失效") || throwableMsg.startsWith("您已经助力过了"))) {
+        || throwableMsg.startsWith("用户不存在/密码错误") || throwableMsg.startsWith("验证码已失效") || throwableMsg.startsWith("您已经助力过了")
+        || throwableMsg.startsWith("您已经获取过抽奖码了") || throwableMsg.startsWith("奖品总数值不相同") || throwableMsg.startsWith("包含已兑奖记录的奖品不能从奖级中删除")
+        )) {
           return;
         }
         StackTraceElementProxy[] stackTraceElementProxy = iThrowableProxy.getStackTraceElementProxyArray();

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

@@ -80,7 +80,7 @@ public class AsyncConsumeTask {
                 .set(AsyncTask::getStatus, 1)
                 .eq(AsyncTask::getId, asyncTask.getId()));
 
-        Assert.isFalse(rtn,"异步任务状态更新失败, id:{0}", asyncTask.getId());
+        Assert.isTrue(rtn,"异步任务状态更新失败, id:{0}", asyncTask.getId());
     }
 
 }