|
|
@@ -2,8 +2,6 @@ package com.uas.platform.b2b.v2.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.uas.sso.entity.PartnershipRecordView;
|
|
|
-import com.uas.sso.util.AccountUtils;
|
|
|
import com.uas.platform.b2b.core.util.ThreadUtils;
|
|
|
import com.uas.platform.b2b.dao.CommonDao;
|
|
|
import com.uas.platform.b2b.dao.InvitationRecordDao;
|
|
|
@@ -16,23 +14,25 @@ import com.uas.platform.b2b.service.EnterpriseService;
|
|
|
import com.uas.platform.b2b.service.InvitationRecordService;
|
|
|
import com.uas.platform.b2b.service.UserService;
|
|
|
import com.uas.platform.b2b.support.MessageConf;
|
|
|
-import com.uas.platform.b2b.temporary.model.SmsMessage;
|
|
|
+import com.uas.platform.b2b.support.SendMsgUtils;
|
|
|
import com.uas.platform.b2b.v2.model.Invitation;
|
|
|
import com.uas.platform.b2b.v2.service.InviteRecordService;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
import com.uas.platform.core.exception.NotFoundException;
|
|
|
import com.uas.platform.core.model.Constant;
|
|
|
-import com.uas.platform.core.util.HttpUtil;
|
|
|
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
|
|
|
import com.uas.search.b2b.model.PageParams;
|
|
|
import com.uas.search.b2b.model.SPage;
|
|
|
+import com.uas.sso.entity.PartnershipRecordView;
|
|
|
+import com.uas.sso.util.AccountUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* Created by hejq on 2018-03-22.
|
|
|
@@ -61,11 +61,6 @@ public class InviteRecordServiceImpl implements InviteRecordService {
|
|
|
@Autowired
|
|
|
private UserDao userDao;
|
|
|
|
|
|
- /**
|
|
|
- * 短信接口
|
|
|
- */
|
|
|
- final String messageUrl = "http://message.ubtob.com/sms/send";
|
|
|
-
|
|
|
/**
|
|
|
* 通过填写的名称检验企业是否已注册
|
|
|
*
|
|
|
@@ -270,34 +265,6 @@ public class InviteRecordServiceImpl implements InviteRecordService {
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 发送短信通知联系人
|
|
|
- *
|
|
|
- * @param enName 邀请企业名称
|
|
|
- * @param contactTel 联系人
|
|
|
- * @param userName 管理员姓名
|
|
|
- * @param adnimTel 管理员电话
|
|
|
- */
|
|
|
- private void sendMsgToContact(final String enName, final String contactTel, final String userName, final String adnimTel) {
|
|
|
- ThreadUtils.task(new Runnable() {
|
|
|
- @Override
|
|
|
- public void run() {
|
|
|
- try {
|
|
|
- SmsMessage sms = new SmsMessage();
|
|
|
- List<Object> obj = new ArrayList<Object>();
|
|
|
- obj.add(enName);
|
|
|
- obj.add(userName + "(" + adnimTel + ")");
|
|
|
- sms.setParams(obj);
|
|
|
- sms.setReceiver(contactTel);
|
|
|
- sms.setTemplateId(messageConf.getMsgAddPartNoticeContact());
|
|
|
- HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- }).run();
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 发送短信通知管理员
|
|
|
*
|
|
|
@@ -305,22 +272,8 @@ public class InviteRecordServiceImpl implements InviteRecordService {
|
|
|
* @param adnimTel 管理员联系方式
|
|
|
*/
|
|
|
private void sendMsgToManager(final String enName, final String adnimTel) {
|
|
|
- ThreadUtils.task(new Runnable() {
|
|
|
- @Override
|
|
|
- public void run() {
|
|
|
- try {
|
|
|
- SmsMessage sms = new SmsMessage();
|
|
|
- List<Object> obj = new ArrayList<Object>();
|
|
|
- obj.add(enName);
|
|
|
- sms.setParams(obj);
|
|
|
- sms.setReceiver(adnimTel);
|
|
|
- sms.setTemplateId(messageConf.getMsgAddPartNoticeManager());
|
|
|
- HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- }).run();
|
|
|
+ String[] args = {enName};
|
|
|
+ SendMsgUtils.sednMsg(adnimTel, messageConf.getMsgInvitationForB2B(), args);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -401,15 +354,8 @@ public class InviteRecordServiceImpl implements InviteRecordService {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
try {
|
|
|
- SmsMessage sms = new SmsMessage();
|
|
|
- List<Object> obj = new ArrayList<Object>();
|
|
|
- obj.add(record.getVendusername());
|
|
|
- obj.add(record.getVendname());
|
|
|
- obj.add(custUser.getUserName() + "(" + custEn.getEnName() + ")");
|
|
|
- sms.setParams(obj);
|
|
|
- sms.setReceiver(record.getVendusertel());
|
|
|
- sms.setTemplateId(messageConf.getMsgInvitationForB2B());
|
|
|
- HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
|
|
|
+ String[] args = {record.getVendusername(), record.getVendname(), custUser.getUserName() + "(" + custEn.getEnName() + ")"};
|
|
|
+ SendMsgUtils.sednMsg(record.getVendusertel(), messageConf.getMsgInvitationForB2B(), args);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
hejq