mearge代码以及短信修改

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -2459,7 +2459,18 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                             }
                             if (!StringUtils.equals(cargoControlCode.concat(cargoControlPhone), consigneeCountryCode.concat(consigneePhone))) {
                                 // 给收货人发送短信
-                                this.smsSendNotice(consigneeCountryCode, consigneePhone, consigneeCustomerId, templateCode, consigneeParamMap);
+                                SmsSendSingleToUserReqDTOV2 rv2 =  new SmsSendSingleToUserReqDTOV2();
+                                rv2.setTemplateParams(consigneeParamMap);
+                                rv2.setNodeValue(nodeValue);
+                                rv2.setUserId(consigneeCustomerId);
+                                rv2.setMobile(consigneePhone);
+                                rv2.setAreaCode(consigneeCountryCode);
+                                rv2.setIsTransport(SmsIsTransportEnum.SMS_IS_TRANSPORT_1.getValue());
+                                rv2.setTransportId(orderDO.getTransportId());
+                                rv2.setIsOrders(SmsIsOrdersEnum.SMS_ORDERS_0.getValue());
+                                rv2.setMessageType(SmsMessageTypeEnum.SMS_MESSAGE_TYPE_1.getValue());
+                                smsSendApi.sendSingleSmsToAdminV2(rv2,logisticsInfoDto.getDestCountryId()+ Constants.COLON+logisticsInfoDto.getDestCityId()+Constants.COLON
+                                        +logisticsInfoDto.getDestWarehouseId());
                             }
                         }
                     }