Merge branch 'pre' into 'master'

Pre

See merge request !168

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

@@ -69,6 +69,11 @@ public class SmsEnum {
          * - 模版内容:您已成功购买${name}门票。可至个人中心查看订单 http://t.cn/ExMlr1B。演出${time}开始。微信关注 摩登天空服务号，获得更多演出资讯。特别提示：下载“正在现场APP”最新版，使用“在场”功能，可结识该场演出中共同观演的在场好友。
          */
         SMS_225995308,
+        /**
+         * 购买会员
+         * - 模版内容:亲爱的登登登，为了给登登登VIP提供更加优质的专属服务，诚邀您添加专属小助理微信，请前往微信关注"摩登天空服务号"，回复VIP，添加小助理微信～回T退订
+         */
+        SMS_232912651,
         ;
 
     }

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.liquidnet.common.sms.constant.SmsEnum;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCallbackParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
@@ -13,10 +14,7 @@ import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.adam.util.MemberUtil;
 import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.adam.util.QueueUtils;
-import com.liquidnet.service.base.ErrorMapping;
-import com.liquidnet.service.base.PagedResult;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.*;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 import lombok.extern.slf4j.Slf4j;
@@ -373,16 +371,17 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 toMqSqls.add(SqlMapping.get("candy_mgt_coupon.add_for_member"));
                 LinkedList<Object[]> initMemberRightsCouponObjs = this.issueMemberRightsCouponProcessing(now, userInfoVo.getMobile(), handleMemberOrderVo.getMemberId());
 
-                queueUtils.sendMsgByRedis(
-                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+                queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UMEMBER.getKey(),
                         SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs, updateUserInfoObjs, updateUserMobileLocateObjs, initMemberRightsCouponObjs)
                 );
             } else {
-                queueUtils.sendMsgByRedis(
-                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+                queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UMEMBER.getKey(),
                         SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs, updateUserInfoObjs, updateUserMobileLocateObjs)
                 );
             }
+            queueUtils.sendMsgByRedis(MQConst.AdamQueue.SMS_NOTICE.getKey(), SmsMessage.builder().setPhone(userInfoVo.getMobile())
+                    .setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232912651.name()).toJson()
+            );
             return ResponseDto.success();
         } catch (Exception e) {
             log.error("购买会员支付回调处理异常[CallbackParam={}]", JsonUtils.toJson(parameter), e);
@@ -567,10 +566,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             LinkedList<Object[]> initMemberRightsCouponObjs = this.issueMemberRightsCouponProcessing(now, userInfoVo.getMobile(), initMemberOrderVo.getMemberId());
 
             s = System.currentTimeMillis();
-            queueUtils.sendMsgByRedis(
-                    MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+            queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UMEMBER.getKey(),
                     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()
+            );
             log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
         } catch (Exception e) {
             log.error("会员兑换发生异常[memberCodeVo={}]", JsonUtils.toJson(memberCodeVo), e);

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/receiver/AbstractSmsRedisReceiver.java

 package com.liquidnet.service.consumer.adam.receiver;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.liquidnet.common.sms.processor.SmsProcessor;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -47,7 +48,9 @@ public abstract class AbstractSmsRedisReceiver implements StreamListener<String,
         boolean aBoolean = false;
         try {
             SmsMessage smsMessage = JsonUtils.fromJson(msg, SmsMessage.class);
-            aBoolean = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+//            aBoolean = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+            ObjectNode templateParam = smsMessage.getTemplateParam();
+            aBoolean = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), null == templateParam ? "" : templateParam.toString());
         } catch (Exception e) {
             log.error("CONSUMER SMS FAIL ==> {}", e.getMessage(), e);
         } finally {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractSmsRedisReceiver.java

 package com.liquidnet.service.consumer.kylin.receiver;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.liquidnet.common.sms.processor.SmsProcessor;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -48,7 +49,9 @@ public abstract class AbstractSmsRedisReceiver implements StreamListener<String,
         boolean aBoolean = false;
         try {
             SmsMessage smsMessage = JsonUtils.fromJson(msg, SmsMessage.class);
-            aBoolean = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+//            aBoolean = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+            ObjectNode templateParam = smsMessage.getTemplateParam();
+            aBoolean = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), null == templateParam ? "" : templateParam.toString());
         } catch (Exception e) {
             log.error("CONSUMER SMS FAIL ==> {}", e.getMessage(), e);
         } finally {