From e854b3c5b3c30718919d36aea2f1973454a687f2 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 21 Sep 2023 13:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=AA=8C=E6=94=B6=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderReviewController.java  | 14 ++++++++------
 .../com/glxp/api/http/sync/SpGetHttpClient.java    |  6 +++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
index 62f9d1eb6..37dc5c247 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
@@ -290,25 +290,28 @@ public class IoOrderReviewController extends BaseController {
                 } else {
                     ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
                     BeanUtil.copyProperties(updateExportStatusRequest, reviewFinishRequest);
-                    updateSpmsStauts(reviewFinishRequest);
+                    log.error("更新外网验收状态");
+                    updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
                     return updateReview(authAdmin, orderEntity);
                 }
             }
         } else {
             ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
             BeanUtil.copyProperties(updateExportStatusRequest, reviewFinishRequest);
-            updateSpmsStauts(reviewFinishRequest);
+            log.error("更新外网验收状态");
+            updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
             return updateReview(authAdmin, orderEntity);
         }
 
     }
 
-    public void updateSpmsStauts(ReviewFinishRequest reviewFinishRequest) {
+    public void updateSpmsStauts(ReviewFinishRequest reviewFinishRequest, String userId) {
         ThreadUtil.execAsync(() -> {
             try {
-                spGetHttp.reviewOrder(reviewFinishRequest, getUserId() + "");
+                log.error("开始调用中继服务");
+                spGetHttp.reviewOrder(reviewFinishRequest, userId);
             } catch (Exception e) {
-                log.error("下载异常", ExceptionUtils.getStackTrace(e));
+                log.error("更新验收状态异常", ExceptionUtils.getStackTrace(e));
                 e.printStackTrace();
             }
 
@@ -577,7 +580,6 @@ public class IoOrderReviewController extends BaseController {
     private String checkReviewAuth(String orderId, String userId, String action) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
 
-
         if (orderEntity == null) {
             ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest();
             reviewSpmsRequest.setBillNo(orderId);
diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
index fce8d05ee..b2d77ef35 100644
--- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
+++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
@@ -37,6 +37,7 @@ import com.glxp.api.service.sync.SyncDataSetService;
 import com.glxp.api.service.sync.SyncEditLogService;
 import com.glxp.api.service.sync.SyncEditTypeService;
 import com.glxp.api.util.OkHttpCli;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +45,7 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Slf4j
 @Service
 public class SpGetHttpClient {
 
@@ -232,6 +234,7 @@ public class SpGetHttpClient {
         header.add("ADMIN_ID");
         header.add(userId);
         String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/order/getSimpleOrder", json, Convert.toStrArray(header));
+        log.error("获取验收单据返回结果：" + result);
         BaseResponse<IoOrderEntity> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<IoOrderEntity>>() {
                 });
@@ -255,9 +258,10 @@ public class SpGetHttpClient {
         List<String> header = (List<String>) Convert.toList(buildHeader());
         header.add("ADMIN_ID");
         header.add(userId);
-
         String json = JSONUtil.toJsonStr(reviewFinishRequest);
+        log.error("验收自助平台单据参数：" + json);
         String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/inout/order/web/updateStatus", json, Convert.toStrArray(header));
+        log.error("验收自助平台单据结果：" + json);
         BaseResponse<String> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                 });