From 4912b61ae4b866031ab474eca036c6691c151f71 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 11 Jul 2024 09:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=81=E6=B3=A2=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=A5=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/INingboBankTreasuryService.java   |  2 +-
 .../impl/NingboBankTreasuryServiceImpl.java   | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java
index 3db014fa..d4f0b098 100644
--- a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java
+++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java
@@ -15,7 +15,7 @@ public interface INingboBankTreasuryService {
      * @param jsonObject
      * @return com.hzya.frame.web.entity.JsonResultEntity
      **/
-    JsonResultEntity sendNbBank(JSONObject jsonObject);
+    Object sendNbBank(JSONObject jsonObject);
 
     /**
      *
diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
index d90dc8f0..488eb869 100644
--- a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
@@ -33,7 +33,8 @@ public class NingboBankTreasuryServiceImpl implements INingboBankTreasuryService
      * @Date 4:45 下午 2024/7/9
      **/
     @Override
-    public JsonResultEntity sendNbBank(JSONObject jsonObject) {
+    public Object sendNbBank(JSONObject jsonObject) {
+        JSONObject returnJson = new JSONObject();
         JSONObject entity = getstrObj("jsonStr", jsonObject);
         String dataJson = entity.getString("Data");
         String appKey = entity.getString("appKey");
@@ -48,30 +49,35 @@ public class NingboBankTreasuryServiceImpl implements INingboBankTreasuryService
             OpenSDK.dynamicInit(configParam,true);
         } catch (SDKException e) {
             logger.error("初始化宁波银行OpenSDK错误:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("初始化宁波银行OpenSDK错误");
+            returnJson.put("retCode","9999");
+            returnJson.put("retMsg","初始化宁波银行OpenSDK错误");
+            return returnJson;
         }
         //发送数据
         try {
             String returnData = OpenSDK.send(productID,serviceID,dataJson.replace(" ",""));
-            //String returnData = OpenSDK.send(productID,serviceID,dataJson);
             if(returnData == null || "".equals(returnData)){
-                return BaseResult.getFailureMessageEntity("发送宁波银行OpenSDK返回错误");
+                returnJson.put("retCode","9999");
+                returnJson.put("retMsg","发送宁波银行OpenSDK返回错误");
+                return returnJson;
             }
             try {
-                JSONObject returnJson = JSONObject.parseObject(returnData);
+                returnJson = JSONObject.parseObject(returnData);
                 JSONObject retData = returnJson.getJSONObject("Data");
                 String retCode = retData.getString("retCode");
-                if(retCode != null && "0000".equals(retCode)){
-                    return BaseResult.getSuccessMessageEntity("发送宁波银行成功",returnJson);
-                }else {
-                    return BaseResult.getFailureMessageEntity("发送宁波银行错误",returnJson);
-                }
+                String retMsg = retData.getString("retMsg");
+                returnJson.put("retCode",retCode);
+                returnJson.put("retMsg",retMsg);
+                return returnJson;
             } catch (Exception e) {
-                return BaseResult.getFailureMessageEntity("发送宁波银行OpenSDK返回转换Json错误");
+                returnJson.put("retCode","9999");
+                returnJson.put("retMsg","发送宁波银行OpenSDK返回转换Json错误");
+                return returnJson;
             }
         } catch (Exception e) {
-            logger.error("发送宁波银行OpenSDK错误:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("发送宁波银行OpenSDK错误");
+            returnJson.put("retCode","9999");
+            returnJson.put("retMsg","发送宁波银行OpenSDK错误");
+            return returnJson;
         }
     }