From 2af01de1e846fed2a8453a96abe806e34ae8f7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Tue, 18 Jul 2023 17:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=80=E6=9D=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=90=9C=E7=B4=A2=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/res/inout/IoOrderDetailResultResponse.java | 5 +++--
 src/main/java/com/glxp/api/res/inout/IoOrderResponse.java   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
index 8c18e19e1..894385e7c 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -166,10 +166,11 @@ public class IoOrderDetailResultResponse {
     private String fromName;
 
     public String getFromName() {
-        if (StrUtil.isNotEmpty(fromInvName))
-            return fromInvName;
         if (StrUtil.isNotEmpty(fromCorpName))
             return fromCorpName;
+        if (StrUtil.isNotEmpty(fromInvName))
+            return fromInvName;
+
 
         return fromName;
     }
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
index f2771f3b7..28fa32531 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@@ -243,11 +243,11 @@ public class IoOrderResponse {
     private int invoiceStatus;//发票登记状态0：未登记，1：未全部登记；2：已全部登记
 
     public String getFromName() {
-        if (StrUtil.isNotEmpty(fromInvName))
-            return fromInvName;
+
         if (StrUtil.isNotEmpty(fromCorpName))
             return fromCorpName;
-
+        if (StrUtil.isNotEmpty(fromInvName))
+            return fromInvName;
         return fromName;
     }
 }