邮件和短信发送接口调整

donate-service/src/main/java/com/uas/service/donate/controller/MessageSendController.java

@@ -23,16 +23,16 @@ public class MessageSendController {
     private MessageService messageService;
 
     /**
-     * 发送短信接口
+     * 发送邮件接口
      */
-    public ResponseEntity<String> sendMessage (String receivedMail, Map<String, Object> model) {
-        return messageService.sendMessage(receivedMail, model);
+    public ResponseEntity<String> sendMail (String receivedMail, Map<String, Object> model) {
+        return messageService.sendMail(receivedMail, model);
     }
 
     /**
-     * 发送邮件接口
+     * 发送短信接口
      */
-    public ResponseEntity<String> sendMail(String receiverTel, List<Object> obj) {
-        return messageService.sendMail(receiverTel, obj);
+    public ResponseEntity<String> sendMessage(String receiverTel, List<Object> obj) {
+        return messageService.sendMessage(receiverTel, obj);
     }
 }

donate-service/src/main/java/com/uas/service/donate/service/MessageService.java

@@ -11,7 +11,7 @@ import java.util.Map;
  */
 public interface MessageService {
 
-    ResponseEntity<String> sendMessage(String receivedEmail, Map<String, Object> model);
+    ResponseEntity<String> sendMail(String receivedEmail, Map<String, Object> model);
 
-    ResponseEntity<String> sendMail(String receiverTel, List<Object> obj);
+    ResponseEntity<String> sendMessage(String receiverTel, List<Object> obj);
 }

donate-service/src/main/java/com/uas/service/donate/service/impl/MessageServiceImpl.java

@@ -29,9 +29,10 @@ public class MessageServiceImpl implements MessageService {
     private MessageConfiguration messageConfiguration;
 
     @Override
-    public ResponseEntity<String> sendMessage(String receivedEmail, Map<String, Object> model) {
+    public ResponseEntity<String> sendMail(String receivedEmail, Map<String, Object> model) {
         try {
             if (null != messageConfiguration.getTplInvitationForB2B()) {
+                // 这些需要在调用接口之前设置
                 model.put("vendorusername", "");
                 model.put("vendorname", "");
                 model.put("custname", "");
@@ -47,7 +48,7 @@ public class MessageServiceImpl implements MessageService {
     }
 
     @Override
-    public ResponseEntity<String> sendMail(String receiverTel, List<Object> obj) {
+    public ResponseEntity<String> sendMessage(String receiverTel, List<Object> obj) {
         try {
             if (null != messageConfiguration.getMsgInvitationForB2B()) {
                 SmsMessage sms = new SmsMessage();