From 54eeaa4d4f73900b2a4a808771ce3c59c44e5fa5 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Tue, 10 Dec 2024 18:38:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8C=BB=E4=BF=9D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98=20=E6=80=8E=E4=B9=88?=
 =?UTF-8?q?=E6=A0=B7=E9=83=BD=E6=98=AF=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/http/ErpBasicClient.java  | 17 +++++++++++------
 .../collect/IoCollectOrderBackupService.java    | 10 ++++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java
index f44eff817..b172ff341 100644
--- a/src/main/java/com/glxp/api/http/ErpBasicClient.java
+++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java
@@ -1,6 +1,9 @@
 package com.glxp.api.http;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.api.common.res.BaseResponse;
@@ -271,20 +274,22 @@ public class ErpBasicClient {
      * @param postOrderRequest
      * @return
      */
-    public BaseResponse<BasicSkPrescribeResponse> postOrder(PostCollectOrderRequest postOrderRequest) {
+    public BaseResponse postOrder(PostCollectOrderRequest postOrderRequest) {
         ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys());
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/uploadCollectOrder";
+        String response=null;
         try {
-            String response = httpOkClient.uCloudPost(url, postOrderRequest);
+            response =  HttpUtil.post(url,JSONUtil.toJsonStr(postOrderRequest));
+//             response = httpOkClient.uCloudPost(url, postOrderRequest);
             if (StrUtil.isEmpty(response)) {
                 return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
             }
-            BaseResponse<BasicSkPrescribeResponse> listBaseResponse =
-                    JSONObject.parseObject(response, new TypeReference<BaseResponse<BasicSkPrescribeResponse>>() {
-                    });
+            // 判断不是
 
-            return listBaseResponse;
+            return  JSONUtil.toBean(response,BaseResponse.class);
         } catch (Exception e) {
+            log.error("获取医保单据信息原来数据==="+response);
+
             log.error("获取医保单据信息", e);
             return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage());
         }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index 0b98a6540..1a7428edd 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -315,7 +315,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             }
         }
         // 医保上传
-        BaseResponse<BasicSkPrescribeResponse> baseResponse = erpBasicClient.postOrder(orderRequest);
+        BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest);
         log.debug("单据返回=========" + baseResponse);
         if (baseResponse.getCode() == 20000) {
             // 触发上传 转发至中继服务 到外网 再到国家同步库
@@ -327,12 +327,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                     throw new JsonException("触发上传 转发至中继服务 到外网 再到国家同步库 接口服务出错：" + stringBaseResponse.getMessage());
                 }
             });
-        }
-        if (baseResponse.getCode() == 520) {
-            Log.error("上传失败，" + baseResponse.getMessage());
         } else {
             throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
         }
+//        if (baseResponse.getCode() == 520) {
+//            Log.error("上传失败，" + baseResponse.getMessage());
+//        } else {
+//            throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
+//        }
 
     }