暂存

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java

@@ -6,10 +6,7 @@ import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/adjudication")
@@ -26,8 +23,27 @@ public class AdjudicationController extends BaseController {
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.createDocument(caseApplication);
     }
-    @PostMapping("/")
-    public AjaxResult sendDocumentByEmail(){
-        return adjudicationService.sendDocumentByEmail();
+
+    /**
+     * 裁决书送达(电子邮件)
+     * @param id 案件id
+     * @param appEmail 申请人邮箱
+     * @param resEmail 被申请人邮箱
+     * @return
+     */
+    @PostMapping("/delivery")
+    public AjaxResult sendDocumentByEmail(Long id,String appEmail,String resEmail){
+        return adjudicationService.sendDocumentByEmail(id,appEmail,resEmail);
+    }
+
+    /**
+     * 根据快递单号查询物流信息
+     * @param trackingNum 单号
+     * @param phoneLastFour 收/寄件人手机号后四位，顺丰快递需填写本字段。
+     * @return
+     */
+    @GetMapping("/logistics")
+    public AjaxResult  getLogisticsInfo(String trackingNum,Integer phoneLastFour){
+        return adjudicationService.getLogisticsInfo(trackingNum,phoneLastFour);
     }
 }

ruoyi-admin/src/main/resources/application.yml

@@ -92,30 +92,16 @@ spring:
     resources:
       static-locations:  file:/home/ruoyi/
   mail:
-    # 邮件服务地址
     host: smtp.163.com
-    # 默认端口25,可不写
     port: 25
-    # 编码格式
-    default-encoding: utf-8
-    # 发送者用户名
-    username: xxx@163.com
-    # 授权码，刚才获取的代码
-    password: xxx
-    # 其它参数
-    #    properties:
-    #      mail:
-    #        smtp:
-    #          # 如果是用 SSL 方式，需要配置如下属性
-    #          ssl:
-    #            enable: true
-    #            required: true
-    #          # 邮件接收时间的限制，单位毫秒
-    #          timeout: 10000
-    #          # 连接时间的限制，单位毫秒
-    #          connectiontimeout: 10000
-    #          # 邮件发送时间的限制，单位毫秒
-    #          writetimeout: 10000
+    username: hjbjava@163.com
+    password: BSRSSEPJWGNNVYYL
+    default-encoding: UTF-8
+    properties:
+      mail:
+        smtp:
+          socketFactoryClass: javax.net.ssl.SSLSocketFactory
+        debug: false
 
 # token配置
 token: