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/OrderChannelApiUtil.java |   64 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/utils/order/OrderChannelApiUtil.java b/src/main/java/com/taoke/autopay/utils/order/OrderChannelApiUtil.java
index 2365766..47faace 100644
--- a/src/main/java/com/taoke/autopay/utils/order/OrderChannelApiUtil.java
+++ b/src/main/java/com/taoke/autopay/utils/order/OrderChannelApiUtil.java
@@ -36,36 +36,40 @@
      * @param: orderChannelName
      **/
     public static boolean isMerchantCanPay(OrderChannelEnum channel, String merchant, BigDecimal payMoney) throws UnsupportedEncodingException {
-        if (channel == OrderChannelEnum.cyx) {
-            String url = String.format("https://api.youihuo.com/open/free.checkKsCompanyName?bsName=%s&apiKey=%s", URLEncoder.encode(merchant, "UTF-8"), OrderChannelUtil.CYX_API_KEY);
-            String result = HttpUtil.get(url);
-            logger.info(String.format("瓒呬剑浜晢瀹朵粯娆惧垽鏂細%s-%s-%s", merchant, result, payMoney!=null?payMoney.setScale(2,RoundingMode.HALF_UP).toString():null));
-            JSONObject root = JSONObject.fromObject(result);
-            System.out.println(result);
-            if (root.optInt("code") == 1000) {
-                return true;
-            }
-        } else if (channel == OrderChannelEnum.bps) {
-            String url = String.format("https://api.bpshe.com/mall/douyinOMS/getSubsidyOrderInfo?appKey=cdaef330f1324961a73e15a85ab67fd2&payAccount=%s", URLEncoder.encode(merchant, StandardCharsets.UTF_8.displayName()));
-            Map<String, String> headers = new HashMap<>();
-            headers.put("Accept", "application/json;charset=utf-8");
-            String result = HttpUtil.get(url, headers);
-            logger.info(String.format("鐖嗗搧绀惧晢瀹朵粯娆惧垽鏂細%s-%s-%s", merchant, result, payMoney!=null?payMoney.setScale(2,RoundingMode.HALF_UP).toString():null));
-            JSONObject root = JSONObject.fromObject(result);
-            if (root.optInt("errCode") == 0) {
-                JSONArray array = root.optJSONObject("data").optJSONArray("payAmounts");
-                if (array != null) {
-                    if (payMoney == null) {
-                        return true;
-                    }
-                    Set<String> moneys = new HashSet<>();
-                    for (int i = 0; i < array.size(); i++) {
-                        moneys.add(array.optString(i));
-                    }
-                    return moneys.contains(payMoney.setScale(2, RoundingMode.HALF_UP).toString());
-                }
-            }
-        }
+       try {
+           if (channel == OrderChannelEnum.cyx) {
+               String url = String.format("https://api.youihuo.com/open/free.checkKsCompanyName?bsName=%s&apiKey=%s", URLEncoder.encode(merchant, "UTF-8"), OrderChannelUtil.CYX_API_KEY);
+               String result = HttpUtil.get(url);
+               logger.info(String.format("瓒呬剑浜晢瀹朵粯娆惧垽鏂細%s-%s-%s", merchant, result, payMoney != null ? payMoney.setScale(2, RoundingMode.HALF_UP).toString() : null));
+               JSONObject root = JSONObject.fromObject(result);
+               System.out.println(result);
+               if (root.optInt("code") == 1000) {
+                   return true;
+               }
+           } else if (channel == OrderChannelEnum.bps) {
+               String url = String.format("https://api.bpshe.com/mall/douyinOMS/getSubsidyOrderInfo?appKey=cdaef330f1324961a73e15a85ab67fd2&payAccount=%s", URLEncoder.encode(merchant, StandardCharsets.UTF_8.displayName()));
+               Map<String, String> headers = new HashMap<>();
+               headers.put("Accept", "application/json;charset=utf-8");
+               String result = HttpUtil.get(url, headers);
+               logger.info(String.format("鐖嗗搧绀惧晢瀹朵粯娆惧垽鏂細%s-%s-%s", merchant, result, payMoney != null ? payMoney.setScale(2, RoundingMode.HALF_UP).toString() : null));
+               JSONObject root = JSONObject.fromObject(result);
+               if (root.optInt("errCode") == 0) {
+                   JSONArray array = root.optJSONObject("data").optJSONArray("payAmounts");
+                   if (array != null) {
+                       if (payMoney == null) {
+                           return true;
+                       }
+                       Set<String> moneys = new HashSet<>();
+                       for (int i = 0; i < array.size(); i++) {
+                           moneys.add(array.optString(i));
+                       }
+                       return moneys.contains(payMoney.setScale(2, RoundingMode.HALF_UP).toString());
+                   }
+               }
+           }
+       }catch(Exception e){
+           logger.error("鍟嗗楠岃瘉閿欒锛�", e);
+       }
         return false;
     }
 

--
Gitblit v1.8.0