|
@@ -76,6 +76,7 @@ public class MqSendMsgConsumer {
|
76
|
76
|
*/
|
77
|
77
|
@RabbitListener(queues = StarterConfigConst.MQ_QUEUE_NAME_MEMBER_MSG, containerFactory = StarterConfigConst.MQ_FACTORY_NAME_SINGLE_PASS_ERR)
|
78
|
78
|
public void memberMsgConsumer(MessageSendVO messageSendVO) {
|
|
79
|
+ log.info("发送会员消息,参数:" + JSON.toJSONString(messageSendVO));
|
79
|
80
|
try {
|
80
|
81
|
//网站名称
|
81
|
82
|
String siteName = stringRedisTemplate.opsForValue().get("basic_site_name");
|
|
@@ -104,8 +105,8 @@ public class MqSendMsgConsumer {
|
104
|
105
|
//定义参数值
|
105
|
106
|
String[] templateArray = messageSendVO.getTemplateParam();
|
106
|
107
|
if (memberSetting.getIsReceive().equals(MsgConst.IS_OPEN_SWITCH_YES)) {
|
107
|
|
- /**----------------------------------------发邮件-----------------------------------------**/
|
108
|
108
|
if (memberTpl.getEmailSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(member.getMemberEmail())) {
|
|
109
|
+ log.info("/**----------------------------------------发邮件-----------------------------------------**/");
|
109
|
110
|
JSONObject jsonObjectForEmail = JSONObject.parseObject(memberTpl.getEmailContent());
|
110
|
111
|
String subject = jsonObjectForEmail.getString("email_subject");
|
111
|
112
|
String content = jsonObjectForEmail.getString("email_content");
|
|
@@ -124,48 +125,50 @@ public class MqSendMsgConsumer {
|
124
|
125
|
}
|
125
|
126
|
//发邮件
|
126
|
127
|
msgSendModel.sendMail(member.getMemberEmail(), subject, content);
|
|
128
|
+ log.info("/**----------------------------------------发邮件结束-----------------------------------------**/");
|
127
|
129
|
}
|
128
|
|
- /**----------------------------------------发邮件结束-----------------------------------------**/
|
129
|
130
|
|
130
|
|
- /**----------------------------------------发短信--------------------------------------------**/
|
131
|
131
|
if (memberTpl.getSmsSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(member.getMemberMobile())) {
|
132
|
|
- JSONObject jsonObject = JSONObject.parseObject(memberTpl.getSmsContent());
|
133
|
|
- String templateContent = jsonObject.getString("templateContent");
|
134
|
|
- SmsRequest smsRequest = new SmsRequest();
|
135
|
|
- smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
|
136
|
|
- smsRequest.setMobile(member.getMemberMobile());
|
137
|
|
- if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
|
138
|
|
- String templateId = jsonObject.getString("templateId");
|
139
|
|
- smsRequest.setTemplateId(templateId);
|
140
|
|
- smsRequest.setTemplateParam(templateArray);
|
141
|
|
- } else {
|
142
|
|
- //云片短信签名
|
143
|
|
- String smsSign = stringRedisTemplate.opsForValue().get("notification_sms_signature");
|
144
|
|
- //模板参数替换值
|
145
|
|
- String[] signParam = {smsSign};
|
146
|
|
- String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
|
|
132
|
+ if (memberTpl.getSmsContent().contains("templateId") || memberTpl.getSmsContent().contains("templateContent")) {
|
|
133
|
+ log.info("/**----------------------------------------发短信--------------------------------------------**/");
|
|
134
|
+ JSONObject jsonObject = JSONObject.parseObject(memberTpl.getSmsContent());
|
|
135
|
+ SmsRequest smsRequest = new SmsRequest();
|
|
136
|
+ smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
|
|
137
|
+ smsRequest.setMobile(member.getMemberMobile());
|
|
138
|
+ if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
|
|
139
|
+ String templateId = jsonObject.getString("templateId");
|
|
140
|
+ smsRequest.setTemplateId(templateId);
|
|
141
|
+ smsRequest.setTemplateParam(templateArray);
|
|
142
|
+ } else {
|
|
143
|
+ String templateContent = jsonObject.getString("templateContent");
|
|
144
|
+ //云片短信签名
|
|
145
|
+ String smsSign = stringRedisTemplate.opsForValue().get("notification_sms_signature");
|
|
146
|
+ //模板参数替换值
|
|
147
|
+ String[] signParam = {smsSign};
|
|
148
|
+ String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
|
147
|
149
|
|
148
|
|
- Matcher matcher = pattern.matcher(templateContent);
|
149
|
|
- int i = 0;
|
150
|
|
- while (matcher.find()) {
|
151
|
|
- templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
|
|
150
|
+ Matcher matcher = pattern.matcher(templateContent);
|
|
151
|
+ int i = 0;
|
|
152
|
+ while (matcher.find()) {
|
|
153
|
+ templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
|
|
154
|
+ }
|
|
155
|
+ smsRequest.setTemplateContent(templateContent);
|
152
|
156
|
}
|
153
|
|
- smsRequest.setTemplateContent(templateContent);
|
|
157
|
+ log.info("发短信參數" + JSON.toJSONString(smsRequest));
|
|
158
|
+ msgSendModel.sendSMS(smsRequest);
|
|
159
|
+ log.info("/**----------------------------------------发短信结束-------------------------------------------**/");
|
154
|
160
|
}
|
155
|
|
- //发短信
|
156
|
|
- msgSendModel.sendSMS(smsRequest);
|
157
|
161
|
}
|
158
|
162
|
|
159
|
|
- /**----------------------------------------发短信结束-------------------------------------------**/
|
160
|
|
-
|
161
|
|
- /**----------------------------------------发站内信开始-----------------------------------------**/
|
162
|
163
|
if (memberTpl.getMsgSwitch() == MsgConst.IS_OPEN_SWITCH_YES) {
|
|
164
|
+ log.info("/**----------------------------------------发站内信开始-----------------------------------------**/");
|
163
|
165
|
String msgContent = memberTpl.getMsgContent();
|
164
|
166
|
Matcher matcher = pattern.matcher(msgContent);
|
165
|
167
|
int i = 0;
|
166
|
|
- while (matcher.find()) {
|
|
168
|
+ while (matcher.find() && i < templateArray.length) {
|
167
|
169
|
msgContent = msgContent.replace(matcher.group(), templateArray[i++]);
|
168
|
170
|
}
|
|
171
|
+
|
169
|
172
|
MemberReceive memberReceive = new MemberReceive();
|
170
|
173
|
memberReceive.setMsgContent(msgContent);
|
171
|
174
|
memberReceive.setTplCode(memberTpl.getTplCode());
|
|
@@ -175,14 +178,16 @@ public class MqSendMsgConsumer {
|
175
|
178
|
memberReceive.setMsgSendTime(new Date());
|
176
|
179
|
memberReceive.setSource(MsgConst.SOURCE_MEMBER);
|
177
|
180
|
memberReceive.setPushId(0);
|
|
181
|
+ log.info("站內信添加參數" + JSON.toJSONString(memberReceive));
|
178
|
182
|
memberReceiveModel.saveMemberReceive(memberReceive);
|
|
183
|
+ log.info("/**----------------------------------------发站内信结束-----------------------------------------**/");
|
179
|
184
|
}
|
180
|
|
- /**----------------------------------------发站内信结束-----------------------------------------**/
|
181
|
185
|
|
182
|
|
- /**----------------------------------------微信推送开始-----------------------------------------**/
|
|
186
|
+
|
183
|
187
|
if (memberTpl.getWxSwitch() == MsgConst.IS_OPEN_SWITCH_YES) {
|
184
|
188
|
String memberDevOpenId = this.getWxDevOpenId(member);
|
185
|
|
- if (!StringUtils.isEmpty(memberDevOpenId)) {
|
|
189
|
+ if (!StringUtils.isEmpty(memberDevOpenId) && memberTpl.getSmsContent().contains("templateId")) {
|
|
190
|
+ log.info("/**----------------------------------------微信推送开始-----------------------------------------**/");
|
186
|
191
|
JSONObject jsonObjectForMsg = JSONObject.parseObject(memberTpl.getWxContent());
|
187
|
192
|
String templateId = jsonObjectForMsg.getString("templateId");
|
188
|
193
|
WXMsgSenderInfo wxMsgSenderInfo = new WXMsgSenderInfo();
|
|
@@ -210,6 +215,7 @@ public class MqSendMsgConsumer {
|
210
|
215
|
//调用微信接口,发送模板消息
|
211
|
216
|
WxMsgResult wxMsgResult = restTemplate.postForObject(String.format(MsgConst.PUSH_MESSAGE_URL, accessToken), wxMsgSenderInfo, WxMsgResult.class);
|
212
|
217
|
log.info("发送微信模板消息: " + wxMsgResult);
|
|
218
|
+ log.info("/**----------------------------------------微信推送结束-----------------------------------------**/");
|
213
|
219
|
}
|
214
|
220
|
}
|
215
|
221
|
}
|
|
@@ -295,6 +301,7 @@ public class MqSendMsgConsumer {
|
295
|
301
|
*/
|
296
|
302
|
@RabbitListener(queues = StarterConfigConst.MQ_QUEUE_NAME_SELLER_MSG, containerFactory = StarterConfigConst.MQ_FACTORY_NAME_SINGLE_PASS_ERR)
|
297
|
303
|
public void sellerMsgConsumer(MessageSendVO messageSendVO) {
|
|
304
|
+ log.info("发送商户消息,参数:" + JSON.toJSONString(messageSendVO));
|
298
|
305
|
try {
|
299
|
306
|
//网站名称
|
300
|
307
|
String siteName = stringRedisTemplate.opsForValue().get("basic_site_name");
|
|
@@ -326,8 +333,8 @@ public class MqSendMsgConsumer {
|
326
|
333
|
continue;
|
327
|
334
|
}
|
328
|
335
|
if (storeSetting.getIsReceive().equals(MsgConst.IS_OPEN_SWITCH_YES)) {
|
329
|
|
- /**----------------------------------------发邮件-----------------------------------------**/
|
330
|
336
|
if (storeTpl.getEmailSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(vendor.getVendorEmail())) {
|
|
337
|
+ log.info("/**----------------------------------------发邮件-----------------------------------------**/");
|
331
|
338
|
JSONObject jsonObject = JSONObject.parseObject(storeTpl.getEmailContent());
|
332
|
339
|
String subject = jsonObject.getString("email_subject");
|
333
|
340
|
String content = jsonObject.getString("email_content");
|
|
@@ -346,43 +353,45 @@ public class MqSendMsgConsumer {
|
346
|
353
|
}
|
347
|
354
|
//发邮件
|
348
|
355
|
msgSendModel.sendMail(vendor.getVendorEmail(), subject, content);
|
|
356
|
+ log.info("/**----------------------------------------发邮件结束-----------------------------------------**/");
|
349
|
357
|
}
|
350
|
|
- /**----------------------------------------发邮件结束-----------------------------------------**/
|
351
|
358
|
|
352
|
|
- /**----------------------------------------发短信--------------------------------------------**/
|
353
|
359
|
if (storeTpl.getSmsSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(vendor.getVendorMobile())) {
|
354
|
|
- JSONObject jsonObject = JSONObject.parseObject(storeTpl.getSmsContent());
|
355
|
|
- SmsRequest smsRequest = new SmsRequest();
|
356
|
|
- smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
|
357
|
|
- smsRequest.setMobile(vendor.getVendorMobile());
|
358
|
|
- if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
|
359
|
|
- String templateId = jsonObject.getString("templateId");
|
360
|
|
- smsRequest.setTemplateId(templateId);
|
361
|
|
- smsRequest.setTemplateParam(templateArray);
|
362
|
|
- } else {
|
363
|
|
- String templateContent = jsonObject.getString("templateContent");
|
364
|
|
- //模板参数替换值
|
365
|
|
- String[] signParam = {smsSign};
|
366
|
|
- String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
|
367
|
|
- //正则匹配定义的变量
|
368
|
|
- Matcher matcher = pattern.matcher(templateContent);
|
369
|
|
- int i = 0;
|
370
|
|
- while (matcher.find()) {
|
371
|
|
- templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
|
|
360
|
+ if (storeTpl.getSmsContent().contains("templateId") || storeTpl.getSmsContent().contains("templateContent")) {
|
|
361
|
+ log.info("/**----------------------------------------发短信--------------------------------------------**/");
|
|
362
|
+ JSONObject jsonObject = JSONObject.parseObject(storeTpl.getSmsContent());
|
|
363
|
+ SmsRequest smsRequest = new SmsRequest();
|
|
364
|
+ smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
|
|
365
|
+ smsRequest.setMobile(vendor.getVendorMobile());
|
|
366
|
+ if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
|
|
367
|
+ String templateId = jsonObject.getString("templateId");
|
|
368
|
+ smsRequest.setTemplateId(templateId);
|
|
369
|
+ smsRequest.setTemplateParam(templateArray);
|
|
370
|
+ } else {
|
|
371
|
+ String templateContent = jsonObject.getString("templateContent");
|
|
372
|
+ //模板参数替换值
|
|
373
|
+ String[] signParam = {smsSign};
|
|
374
|
+ String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
|
|
375
|
+ //正则匹配定义的变量
|
|
376
|
+ Matcher matcher = pattern.matcher(templateContent);
|
|
377
|
+ int i = 0;
|
|
378
|
+ while (matcher.find()) {
|
|
379
|
+ templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
|
|
380
|
+ }
|
|
381
|
+ smsRequest.setTemplateContent(templateContent);
|
372
|
382
|
}
|
373
|
|
- smsRequest.setTemplateContent(templateContent);
|
|
383
|
+ log.info("短信参数:" + JSON.toJSONString(smsRequest));
|
|
384
|
+ msgSendModel.sendSMS(smsRequest);
|
|
385
|
+ log.info("/**----------------------------------------发短信结束-------------------------------------------**/");
|
374
|
386
|
}
|
375
|
|
- //发短信
|
376
|
|
- msgSendModel.sendSMS(smsRequest);
|
377
|
387
|
}
|
378
|
|
- /**----------------------------------------发短信结束-------------------------------------------**/
|
379
|
388
|
|
380
|
|
- /**----------------------------------------发站内信开始-----------------------------------------**/
|
381
|
389
|
if (storeTpl.getMsgSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES)) {
|
|
390
|
+ log.info("/**----------------------------------------发站内信开始-----------------------------------------**/");
|
382
|
391
|
String msgContent = storeTpl.getMsgContent();
|
383
|
392
|
Matcher matcher = pattern.matcher(msgContent);
|
384
|
393
|
int i = 0;
|
385
|
|
- while (matcher.find()) {
|
|
394
|
+ while (matcher.find() && i < templateArray.length) {
|
386
|
395
|
msgContent = msgContent.replace(matcher.group(), templateArray[i++]);
|
387
|
396
|
}
|
388
|
397
|
StoreReceive storeReceive = new StoreReceive();
|
|
@@ -395,9 +404,11 @@ public class MqSendMsgConsumer {
|
395
|
404
|
storeReceive.setMsgSendTime(new Date());
|
396
|
405
|
storeReceive.setSource(MsgConst.SOURCE_STORE);
|
397
|
406
|
storeReceive.setPushId(0);
|
|
407
|
+ log.info("站内信参数:" + JSON.toJSONString(storeReceive));
|
398
|
408
|
storeReceiveModel.saveStoreReceive(storeReceive);
|
|
409
|
+ log.info("/**----------------------------------------发站内信结束-----------------------------------------**/");
|
399
|
410
|
}
|
400
|
|
- /**----------------------------------------发站内信结束-----------------------------------------**/
|
|
411
|
+
|
401
|
412
|
}
|
402
|
413
|
}
|
403
|
414
|
} catch (Exception e) {
|