Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -872,15 +872,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_171358560 : SmsEnum.ADTemplate.SMS_181500419;
                 }
 
-                if (null != adTemplate) {
-                    queueUtils.sendMsgByRedis(MQConst.KylinQueue.SMS_NOTICE.getKey(),
-                            SmsMessage.builder().setPhone(orderTicketData.getUserMobile())
-                                    .setSignName(SmsEnum.ADSignName.M02.getVal())
-                                    .setTemplateCode(adTemplate.name())
-                                    .setTemplateParam("name", orderTicketData.getPerformanceTitle())
-                                    .setTemplateParam("time", time1 + " " + time2).toJson()
-                    );
-                }
+//                if (null != adTemplate) {
+//                    queueUtils.sendMsgByRedis(MQConst.KylinQueue.SMS_NOTICE.getKey(),
+//                            SmsMessage.builder().setPhone(orderTicketData.getUserMobile())
+//                                    .setSignName(SmsEnum.ADSignName.M02.getVal())
+//                                    .setTemplateCode(adTemplate.name())
+//                                    .setTemplateParam("name", orderTicketData.getPerformanceTitle())
+//                                    .setTemplateParam("time", time1 + " " + time2).toJson()
+//                    );
+//                }
 
                 // 大麦回调
                 sycDamaiOrder(orderTickets.getOrderTicketsId());