From 4f3c2bf2b2966f1e02e8cc1fdd923fca8f3f3d75 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Mon, 6 May 2024 16:42:50 +0800 Subject: [PATCH] fix --- .../java/com/cool/store/enums/SMSMsgEnum.java | 2 +- .../store/service/impl/CommonService.java | 19 ++++++++++--------- .../store/service/impl/PointServiceImpl.java | 8 ++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java index bcf7d4a33..a253617ca 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java @@ -19,7 +19,7 @@ public enum SMSMsgEnum { SECOND_INTERVIEW_REMIND("二审前1小时提醒", "", "SMS_465925428"), SECOND_INTERVIEW_REAPPOINTMENT("二审重新预约", "", "SMS_465940421"), SECOND_INTERVIEW_SUCCESS("二审面审成功", "", "SMS_465980397"), - SELECT_SUCCESS("选铺成功", "", "SMS_465890428"), + SELECT_SUCCESS("选铺成功", "", "SMS_465950846"), RENT_CONTRACT_AUDIT_FAIL("租赁合同上传未通过", "", "SMS_465955429"), SHOP_EXPERIENCE("门店体验安排", "", "SMS_465900449"), ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index 8e8140c7c..88ea1cd24 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -28,10 +28,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -109,11 +106,15 @@ public class CommonService { } } - public void sendSms(String poneNumber, SMSMsgEnum templateCode, List templateParamList){ - sendSms(Arrays.asList(poneNumber), templateCode, templateParamList); + public void sendSms(String poneNumber, SMSMsgEnum templateCode){ + sendSms(Arrays.asList(poneNumber), templateCode, null); } - public void sendSms(List poneNumbers, SMSMsgEnum templateCode, List templateParamList){ + public void sendSms(String poneNumber, SMSMsgEnum templateCode, Map templateParamMap){ + sendSms(Arrays.asList(poneNumber), templateCode, templateParamMap); + } + + public void sendSms(List poneNumbers, SMSMsgEnum templateCode, Map templateParamMap){ List signNameList = new ArrayList<>(); signNameList.add("酷店掌"); AsyncClient client = null; @@ -134,11 +135,11 @@ public class CommonService { .phoneNumberJson(JSONObject.toJSONString(poneNumbers)) .signNameJson(JSONObject.toJSONString(signNameList)) .templateCode(templateCode.getTemplateCode()) - .templateParamJson(JSONObject.toJSONString(templateParamList)) + .templateParamJson("[" + JSONObject.toJSONString(templateParamMap) + "]") .build(); CompletableFuture response = client.sendBatchSms(sendBatchSmsRequest); SendBatchSmsResponse resp = response.get(); - log.info("短信发送response:{}", JSONObject.toJSONString(resp)); + log.info("短信发送templateCode:{}, response:{}", templateCode.getTemplateCode(), JSONObject.toJSONString(resp)); } catch (InterruptedException e) { e.printStackTrace(); } catch (ExecutionException e) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 4d7f0e5e5..805b9d1b5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -382,9 +382,9 @@ public class PointServiceImpl implements PointService { private void initUploadRentContract(PointInfoDO pointInfo) { LineInfoDO lineInfo = lineInfoDAO.getLineInfo(pointInfo.getLineId()); shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20)); - JSONObject templateParam = new JSONObject(); + Map templateParam = new HashMap<>(); templateParam.put("pointName", pointInfo.getAddress()); - commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SELECT_SUCCESS, Arrays.asList(templateParam)); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SELECT_SUCCESS, templateParam); } @Override @@ -760,10 +760,10 @@ public class PointServiceImpl implements PointService { if(PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())){ selectStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12; updateStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20); - JSONObject templateParam = new JSONObject(); + Map templateParam = new HashMap<>(); templateParam.put("pointName", pointInfo.getAddress()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); - commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SELECT_SUCCESS, Arrays.asList(templateParam)); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SELECT_SUCCESS, templateParam); } updateStatusList.add(selectStatus); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, updateStatusList);