Эх сурвалжийг харах

添加合作伙伴发送短信方式增加,根据判断结果采用不同的发送方式

hejq 8 жил өмнө
parent
commit
e46320344c

+ 28 - 0
src/main/java/com/uas/platform/b2b/support/MessageConf.java

@@ -94,6 +94,18 @@ public class MessageConf {
 	@Value("#{message.msgAddPartForB2B}")
     private String msgAddPartForB2B;
 
+    /**
+     * 添加合作伙伴通知管理员
+     */
+	@Value("#{message.msgAddPartNoticeManager}")
+    private String msgAddPartNoticeManager;
+
+    /**
+     * 添加合作伙伴通知联系人
+     */
+    @Value("#{message.msgAddPartNoticeContact}")
+    private String msgAddPartNoticeContact;
+
 	public String getTplInvitationForB2B() {
 		return tplInvitationForB2B;
 	}
@@ -197,4 +209,20 @@ public class MessageConf {
     public void setMsgAddPartForB2B(String msgAddPartForB2B) {
         this.msgAddPartForB2B = msgAddPartForB2B;
     }
+
+    public String getMsgAddPartNoticeManager() {
+        return msgAddPartNoticeManager;
+    }
+
+    public void setMsgAddPartNoticeManager(String msgAddPartNoticeManager) {
+        this.msgAddPartNoticeManager = msgAddPartNoticeManager;
+    }
+
+    public String getMsgAddPartNoticeContact() {
+        return msgAddPartNoticeContact;
+    }
+
+    public void setMsgAddPartNoticeContact(String msgAddPartNoticeContact) {
+        this.msgAddPartNoticeContact = msgAddPartNoticeContact;
+    }
 }

+ 64 - 3
src/main/java/com/uas/platform/b2b/v2/service/impl/InviteRecordServiceImpl.java

@@ -8,6 +8,7 @@ import com.uas.message.sms.service.SmsService;
 import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
+import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
@@ -62,6 +63,9 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     @Autowired
     private SmsService smsService;
 
+    @Autowired
+    private UserDao userDao;
+
     /**
      * 短信接口
      */
@@ -210,8 +214,9 @@ public class InviteRecordServiceImpl implements InviteRecordService {
         String contactTel = null;
         User vu = new User();
         if (!StringUtils.isEmpty(inviteUserTel)) {
-            vu = userService.findUserByUserTel(inviteUserTel);
-            if (null != vu) {
+            List<User> users = userDao.findUserByUserTel(inviteUserTel);
+            if (!CollectionUtils.isEmpty(users)) {
+                vu = users.get(0);
                 record.setVendUserCode(String.valueOf(vu.getUserUU()));
                 record.setVendUserEmail(vu.getUserEmail());
                 String userName = StringUtils.isEmpty(inviteUserName) ? vu.getUserName() : inviteUserName;
@@ -229,7 +234,10 @@ public class InviteRecordServiceImpl implements InviteRecordService {
                 e.printStackTrace();
             }
         } else { // 针对不同的人调用不同的接口
-
+            // 发送给管理员
+            sendMsgToManager(c.getEnName(), adnimTel);
+            // 发送给联系人
+            sendMsgToContact(c.getEnName(), contactTel, user.getUserName(), adnimTel);
         }
         String result = AccountUtils.addNewRecord(record);
         JSONObject object = JSON.parseObject(result);
@@ -238,6 +246,59 @@ 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();
+    }
+
+    /**
+     * 发送短信通知管理员
+     *
+     * @param enName 邀请企业
+     * @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();
+    }
+
     /**
      * 增加注册记录
      *

+ 2 - 0
src/main/resources/dev/message.properties

@@ -12,5 +12,7 @@ msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
 msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
+msgAddPartNoticeManager=4d55f1aa-be3e-4690-9b0d-9f31f75deecb
+msgAddPartNoticeContact=
 
 messagePublicServiceDevUrl=http://192.168.253.131:8080

+ 2 - 0
src/main/resources/prod/message.properties

@@ -12,6 +12,8 @@ msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
 msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
+msgAddPartNoticeManager=4d55f1aa-be3e-4690-9b0d-9f31f75deecb
+msgAddPartNoticeContact=
 
 messagePublicServiceDevUrl=http://10.10.100.23:24000
 #wangyc localhost

+ 2 - 0
src/main/resources/test/message.properties

@@ -12,5 +12,7 @@ msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
 msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
+msgAddPartNoticeManager=4d55f1aa-be3e-4690-9b0d-9f31f75deecb
+msgAddPartNoticeContact=
 
 messagePublicServiceDevUrl=http://218.17.158.219:24000/message/