From c3e7c50660749a9177c6fd5924366b2492cfc428 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Mon, 24 Apr 2023 12:44:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=BF=AB=E9=80=92100=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/mail/param/PostInfoQuery.java    |  2 ++
 .../service/impl/PostInfoServiceImpl.java     | 23 +++++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/param/PostInfoQuery.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/param/PostInfoQuery.java
index 58c5bf69..51cda83b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/param/PostInfoQuery.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/param/PostInfoQuery.java
@@ -20,4 +20,6 @@ public class PostInfoQuery {
     @ApiModelProperty("查询的快递单号")
     @NotBlank(message = "查询的快递单号不能为空")
     private String num;
+    @ApiModelProperty("收、寄件人的电话号码(只能填写一个,顺丰速运必填)")
+    private String phone;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PostInfoServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PostInfoServiceImpl.java
index 0f0d3b62..64cb8600 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PostInfoServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PostInfoServiceImpl.java
@@ -51,20 +51,20 @@ public class PostInfoServiceImpl implements IPostInfoService {
     @Override
     public Result<QueryInfoParam> queryInfo(PostInfoQuery postInfoQuery) {
         // 1.判断是否是邮寄管理中的数据
-        String phone = checkIsMySystem(postInfoQuery);
+        checkIsMySystem(postInfoQuery);
         // 2.调用api
-        Result<QueryInfoParam> result = sendReq(postInfoQuery, phone);
+        Result<QueryInfoParam> result = sendReq(postInfoQuery);
         return result;
 
     }
 
-    private Result<QueryInfoParam> sendReq(PostInfoQuery postInfoQuery, String phone) {
+    private Result<QueryInfoParam> sendReq(PostInfoQuery postInfoQuery) {
         QueryTrackReq queryTrackReq = new QueryTrackReq();
         QueryTrackParam queryTrackParam = new QueryTrackParam();
         setCom(postInfoQuery);
         queryTrackParam.setCom(postInfoQuery.getCom());
         queryTrackParam.setNum(postInfoQuery.getNum());
-        queryTrackParam.setPhone(phone);
+        queryTrackParam.setPhone(postInfoQuery.getPhone());
         queryTrackParam.setResultv2("4");
         String param = new Gson().toJson(queryTrackParam);
 
@@ -92,6 +92,9 @@ public class PostInfoServiceImpl implements IPostInfoService {
     private void setCom(PostInfoQuery postInfoQuery) {
         if ("1".equals(postInfoQuery.getCom())) {
             postInfoQuery.setCom(SF);
+            if (StringUtils.isBlank(postInfoQuery.getPhone())) {
+                throw new JeroBootException("顺丰速递必须填写手机号!");
+            }
         } else if ("2".equals(postInfoQuery.getCom())) {
             postInfoQuery.setCom(EMS);
         } else {
@@ -104,7 +107,7 @@ public class PostInfoServiceImpl implements IPostInfoService {
     * @Date: 2023/4/23 15:18
     * @Remarks: 判断是否是邮寄管理中的数据
     */
-    private String checkIsMySystem(PostInfoQuery postInfoQuery) {
+    private void checkIsMySystem(PostInfoQuery postInfoQuery) {
         Page<PayMailContracrList> page1 = new Page<>(1, 1);
         PayMailContracrList payMailContracrList = new PayMailContracrList();
         payMailContracrList.setPostNo(postInfoQuery.getNum());
@@ -115,18 +118,8 @@ public class PostInfoServiceImpl implements IPostInfoService {
         Page<PayMailBill> page2 = new Page<>(1, 1);
         IPage<PayMailBill> pageList2 = payMailBillService.pageList(page2, queryWrapper);
         int size2 = pageList2.getRecords().size();
-        String phone;
         if (size1 < 1 && size2 < 1) {
             throw new JeroBootException("只能查询“票据邮寄”和“合同邮寄”中的快递单号信息!");
-        } else if (size2 < 1) {
-            phone = pageList1.getRecords().get(0).getPrincipalPhone();
-        } else {
-            phone = pageList2.getRecords().get(0).getPrincipalPhone();
         }
-        if (StringUtils.isBlank(phone)) {
-            throw new JeroBootException("该邮寄信息没有填写邮寄人电话!");
-        }
-        phone = PasswordUtil.decrypt(phone);
-        return phone;
     }
 }