From b4806f58db7eff4ec15fa42ffd0a47793f52337f Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 9 Jan 2024 15:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8F=91=E9=80=81=E4=BC=9A=E9=94=80=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/http/EventCenterHttpRequest.java | 12 ++++++++++++ .../com/cool/store/service/EventRequestTest.java | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java index 434f1eaff..e8f1ea5ff 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java @@ -59,6 +59,9 @@ public class EventCenterHttpRequest { @Value("${hsay.event.systemsource:null}") private String source; + @Value("${spring.profiles.active}") + private String env; + /** * 创建单个事件 * @param request {@link com.cool.store.request.event.CreateSingleEventRequest} @@ -131,6 +134,15 @@ public class EventCenterHttpRequest { */ @Async public void sendSmsVariable(String phone, SMSMsgEnum smsMsgEnum, String... objects) throws ApiException { + + //为避免对真实线索造成困扰和便于测试,测试环境暂不给线索发送会销相关短信 + if (env.equals("pre") + && (SMSMsgEnum.EXHIBITION_INFO_UPDATE.equals(smsMsgEnum) + || SMSMsgEnum.EXHIBITION_CLOSE.equals(smsMsgEnum))) { + log.info("测试环境暂不给线索发送会销相关短信,phone:{},params:{}", phone, objects); + return; + } + //1. 组织消息参数,短信的消息参数为 手机号: 参数1, 参数2, 参数3, 参数4, 参数5,,需要填入的参数为模板中 ${} 中的参数 HashMap smsParams = new HashMap<>(); String params = String.join(",", Arrays.asList(objects)); diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java index 8b5870e56..2589e7f8b 100644 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java +++ b/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java @@ -63,7 +63,7 @@ class EventRequestTest extends AbstractJUnit4SpringContextTests { @Test void testSMSNotice() throws ApiException { - String testPhone = "15735114608"; + String testPhone = "17612868414"; String testDate = "2023-11-05 10:00:00"; String randomStr = RandomUtil.randomString(12); String wxUrlPrefix = "https://wxaurl.cn/"; @@ -90,6 +90,10 @@ class EventRequestTest extends AbstractJUnit4SpringContextTests { randomStr = RandomUtil.randomString(12); testWXUrl = wxUrlPrefix + randomStr; eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.SMS_INVATE, testWXUrl); + //7. 展会信息变更 + randomStr = RandomUtil.randomString(12); + testWXUrl = wxUrlPrefix + randomStr; + eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_INFO_UPDATE, "测试", "2023-12-24", "1008611", testWXUrl); //8. 展会结束 eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_CLOSE, ""); }