From 124c85c184236ae4efa1047c4c203b0815ad215a Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期二, 18 三月 2025 01:07:00 +0800
Subject: [PATCH] 'bug修复'

---
 src/main/java/com/taoke/autopay/utils/order/DYOrderApi.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/utils/order/DYOrderApi.java b/src/main/java/com/taoke/autopay/utils/order/DYOrderApi.java
index aa25c6e..d1a448a 100644
--- a/src/main/java/com/taoke/autopay/utils/order/DYOrderApi.java
+++ b/src/main/java/com/taoke/autopay/utils/order/DYOrderApi.java
@@ -48,27 +48,36 @@
 
     private static DYOrderDto getOrderDetail1(String orderNo) throws KeyOrderException {
         String result = requestByOrderNo1(orderNo);
-        JSONObject root = JSONObject.fromObject(result);
-        if (root.optInt("code") != 1000) {
-            logger.error(String.format("鎶栭煶璁㈠崟鏌ヨ鍑洪敊(瓒呬韩浣�)锛�%s - %s",orderNo, result));
-            throw new KeyOrderException(root.optString("message"));
+        try {
+            JSONObject root = JSONObject.fromObject(result);
+            if (root.optInt("code") != 1000) {
+                logger.error(String.format("鎶栭煶璁㈠崟鏌ヨ鍑洪敊(瓒呬韩浣�)锛�%s - %s", orderNo, result));
+                throw new KeyOrderException(root.optString("message"));
+            }
+            JSONObject data = root.optJSONObject("data");
+            DYOrderDto dto = JsonUtil.getSimpleGson().fromJson(data.toString(), DYOrderDto.class);
+            dto.setOrderChannel(Constant.ORDER_CHANNEL_CYX);
+            return dto;
+        }catch(Exception e){
+            throw new KeyOrderException(e.getMessage());
         }
-        JSONObject data = root.optJSONObject("data");
-        DYOrderDto dto =  JsonUtil.getSimpleGson().fromJson(data.toString(),DYOrderDto.class);
-        dto.setOrderChannel(Constant.ORDER_CHANNEL_CYX);
-        return dto;
     }
 
     private static DYOrderDto getOrderDetail2(String orderNo) throws KeyOrderException {
         String result = requestByOrderNo2(orderNo);
         logger.info(String.format("鐖嗗搧绀炬帴鍙�%s:%s", orderNo, result));
         System.out.println(result);
-        JSONObject root = JSONObject.fromObject(result);
-        if (root.optInt("errCode") != 0) {
-            logger.error(String.format("鎶栭煶璁㈠崟鏌ヨ鍑洪敊(鐖嗗搧绀�)锛�%s - %s",orderNo, result));
-            throw new KeyOrderException(root.optString("errMsg"));
+        JSONObject data = null;
+        try {
+            JSONObject root = JSONObject.fromObject(result);
+            if (root.optInt("errCode") != 0) {
+                logger.error(String.format("鎶栭煶璁㈠崟鏌ヨ鍑洪敊(鐖嗗搧绀�)锛�%s - %s", orderNo, result));
+                throw new KeyOrderException(root.optString("errMsg"));
+            }
+            data = root.optJSONObject("data");
+        }catch(Exception e){
+
         }
-        JSONObject data = root.optJSONObject("data");
         if(data==null){
             logger.error(String.format("鎶栭煶璁㈠崟鏌ヨ鏃犳暟鎹�(2)锛�%s - %s",orderNo, result));
             throw new KeyOrderException("璁㈠崟鏌ヨ鏃犳暟鎹�");

--
Gitblit v1.8.0