From 8609f8566d02e5a809360ecfb5ed6957a3006d8e Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Tue, 15 Oct 2024 21:50:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81west=20dex=20service=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=A4=B1=E8=B4=A5=E5=93=8D=E5=BA=94=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/api/internal/service/west_dex_service.go | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/apps/api/internal/service/west_dex_service.go b/apps/api/internal/service/west_dex_service.go
index d0c4547..b27b3c7 100644
--- a/apps/api/internal/service/west_dex_service.go
+++ b/apps/api/internal/service/west_dex_service.go
@@ -94,25 +94,35 @@ func (w *WestDexService) CallAPI(code string, reqData map[string]interface{}) (r
 		logx.Infof("西部请求响应%+v", westDexResp)
 
 		logx.Infof("西部流水号: %s", westDexResp.ID)
+
+		if westDexResp.Code != "00000" {
+			if westDexResp.Code == "-1" {
+				if westDexResp.Data == "" {
+					logx.Errorf("【西部数据请求】业务失败时响应数据为空: %s %s", westDexResp.Message, westDexResp.Reason)
+					return nil, errs.ErrSystem
+				}
+				decryptedData, DecryptErr := crypto.WestDexDecrypt(westDexResp.Data, w.config.Key)
+				if DecryptErr != nil {
+					logx.Errorf("【西部数据请求】响应数据解密错误: %v", DecryptErr)
+					return nil, errs.ErrSystem
+				}
+				logx.Errorf("【西部数据请求】响应数据业务异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(decryptedData))
+				return decryptedData, errs.ErrDataSource
+			} else {
+				logx.Errorf("【西部数据请求】响应数据异常: %s %s", westDexResp.Message, westDexResp.Reason)
+				return nil, errs.ErrSystem
+			}
+		}
+		if westDexResp.Data == "" {
+			logx.Errorf("【西部数据请求】响应Data字段数据为空")
+			return nil, errs.ErrSystem
+		}
 		// 解密响应数据
 		decryptedData, DecryptErr := crypto.WestDexDecrypt(westDexResp.Data, w.config.Key)
 		if DecryptErr != nil {
 			logx.Errorf("【西部数据请求】响应数据解密错误: %v", DecryptErr)
 			return nil, errs.ErrSystem
 		}
-		logx.Infof("西部请求响应Code：%s", westDexResp.Code)
-		if westDexResp.Code != "00000" {
-			logx.Infof("到这1")
-			if westDexResp.Code == "-1" {
-				logx.Infof("到这2")
-				logx.Errorf("【西部数据请求】响应数据业务异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(decryptedData))
-				return decryptedData, errs.ErrDataSource
-			} else {
-				logx.Infof("到这3")
-				logx.Errorf("【西部数据请求】响应数据异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(decryptedData))
-				return nil, errs.ErrSystem
-			}
-		}
 		// 输出解密后的数据
 		return decryptedData, nil
 	}