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

优化

See merge request quanshu/mp-server!934

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

@@ -32,6 +32,7 @@ public class SendErrorMsgAppender extends UnsynchronizedAppenderBase<ILoggingEve
         || throwableMsg.startsWith("用户不存在/密码错误") || throwableMsg.startsWith("验证码已失效") || throwableMsg.startsWith("您已经助力过了")
         || throwableMsg.startsWith("您已经获取过抽奖码了") || throwableMsg.startsWith("奖品总数值不相同") || throwableMsg.startsWith("包含已兑奖记录的奖品不能从奖级中删除")
         || throwableMsg.startsWith("登录账号不存在") || throwableMsg.startsWith("已选择更高级的渠道,不支持渠道相互嵌套!") || throwableMsg.startsWith("内定人数不能超过100")
+        || throwableMsg.startsWith("卡密不足，无法发货")
         )) {
           return;
         }

mp-service/src/main/java/com/qs/mp/framework/service/impl/AsyncTaskServiceImpl.java

@@ -210,7 +210,7 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
             if (CollectionUtils.isEmpty(goodsCardList) || goodsCardList.size() < userDeliverOrderItem.getGoodsNum()) {
                 LogUtil.error(logger,"卡密不足，无法发货。orderId:{0},itemId:{1},goodsId:{2}",userDeliverOrderItem.getOrderId(),
                     userDeliverOrderItem.getItemId(), userDeliverOrderItem.getGoodsId());
-                throw new ServiceException("卡密不足，无法发货。goodsId=" + userDeliverOrderItem.getGoodsId());
+                throw new ServiceException("卡密不足，无法发货");
             }
 
             for (GoodsCard goodsCard : goodsCardList) {