Merge branch 'pre' into 'master'

~购买会员:短信通知模板更换;

See merge request !170

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -71,9 +71,9 @@ public class SmsEnum {
         SMS_225995308,
         /**
          * 购买会员
-         * - 模版内容:亲爱的登登登，为了给登登登VIP提供更加优质的专属服务，诚邀您添加专属小助理微信，请前往微信关注"摩登天空服务号"，回复VIP，添加小助理微信～回T退订
+         * - 模版内容:欢迎加入登登登VIP大家庭。请微信关注“摩登天空服务号”，回复VIP，获取专属小助理客服服务了，回T退订
          */
-        SMS_232912651,
+        SMS_232908714,
         ;
 
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -380,7 +380,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 );
             }
             queueUtils.sendMsgByRedis(MQConst.AdamQueue.SMS_NOTICE.getKey(), SmsMessage.builder().setPhone(userInfoVo.getMobile())
-                    .setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232912651.name()).toJson()
+                    .setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232908714.name()).toJson()
             );
             return ResponseDto.success();
         } catch (Exception e) {
@@ -570,7 +570,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     SqlMapping.gets(toMqSqls, upsertUserMemberObjs, updateMemberCodeObjs, initMemberOrderObjs, initMemberOrderExtObjs, updateUserInfoObjs, updateUserMobileLocateObjs, initMemberRightsCouponObjs)
             );
             queueUtils.sendMsgByRedis(MQConst.AdamQueue.SMS_NOTICE.getKey(), SmsMessage.builder().setPhone(userInfoVo.getMobile())
-                    .setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232912651.name()).toJson()
+                    .setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232908714.name()).toJson()
             );
             log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
         } catch (Exception e) {