Merge remote-tracking branch 'origin/v24.4_notice_20240903' into v26.2-jdk17springboot3-20240912

performance-web/src/main/java/com/clx/performance/listener/SendOrderStatusNoticeSmsListener.java

@@ -17,6 +17,7 @@ import com.msl.message.sms.api.sms.content.SmsMessageContentImpl;
 import com.msl.message.sms.api.sms.recipient.SmsMessageRecipientImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -51,10 +52,18 @@ public class SendOrderStatusNoticeSmsListener {
     public void onMessage(Message message) {
         try{
             log.info("监听到发送订单状态通知短信,消息内容{}", new String(message.getBody()));
+
+
             OrderInfoMessage order = JSONUtil.toBean(new String(message.getBody()),
                     new TypeReference<MqWrapper<OrderInfoMessage>>() {
                     },false).getData();
 
+            String targets = getTargets(order.getOrderStatus());
+            log.info("获取需要发送短信的手机号列表:{}",targets);
+            if(StringUtils.isBlank(targets)){
+                return;
+            }
+
             SmsMessage smsMessage = new SmsMessage();
 
             //设置消息内容
@@ -73,7 +82,7 @@ public class SendOrderStatusNoticeSmsListener {
             //设置消息接收人
             SmsMessageRecipientImpl smsMessageRecipient = new SmsMessageRecipientImpl();
             smsMessageRecipient.setUserType(USER_MOBILE.getCode());
-            smsMessageRecipient.setTargets(getTargets(order.getOrderStatus()));
+            smsMessageRecipient.setTargets(targets);
 
 
             smsMessage.setContent(smsMessageContent);
@@ -86,7 +95,7 @@ public class SendOrderStatusNoticeSmsListener {
             //向消息中心发送消息
             log.info("订单状态提醒发送短信开始，请求参数：{}", JSON.toJSONString(smsMessage));
             Result<Object> result = configuredOpenClient.doAction(new MessageAction(smsMessage));
-            log.info("订单状态提醒发送短信开始，响应结果：{}", JSON.toJSONString(result));
+            log.info("订单状态提醒发送短信结束，响应结果：{}", JSON.toJSONString(result));
         }catch (Exception e){
             log.info("监听到发送订单状态通知短信发生异常，异常原因：{}", ExceptionUtils.getStackTrace(e));
         }