From 2c13a6f34253ee595eedac139ab2c4b05a26bbc2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 一月 2022 12:18:02 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
index f5cc75f..9549c42 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
@@ -51,6 +51,7 @@
 
     //寰俊鏀粯
     public static final String PAY_UNIFIED_ORDER_URL = "https://api.plutuspay.com/open/v2/jsPay";
+    public static final String PAY_UNIFIED_ORDER_NATIVE_URL = "https://api.plutuspay.com/open/v2/preCreate";
 
 
     private static final String VERSION = "1.0";
@@ -162,10 +163,14 @@
         String privateKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(), "PLUTUS_PRIVATE_KEY");
         String devId = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "PLUTUS_DEV_ID");
 
-        String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDto.getPayPassword(),devId);
+        String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDto.getPayPassword(), devId);
         System.out.println(param);
-
-        String str = PlutusFactory.post(PAY_UNIFIED_ORDER_URL, param);
+        String str = "";
+        if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
+            str = PlutusFactory.post(PAY_UNIFIED_ORDER_NATIVE_URL, param);
+        } else {
+            str = PlutusFactory.post(PAY_UNIFIED_ORDER_URL, param);
+        }
         System.out.println(str);
 
         JSONObject json = JSON.parseObject(str);
@@ -192,7 +197,12 @@
             throw new IllegalArgumentException("鏀粯澶辫触" + paramObj.getString("error"));
         }
 
-        return paramObj.getJSONObject("payInfo");
+        if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
+            paramObj.put("code", 0);
+            return paramObj;
+        } else {
+            return paramObj.getJSONObject("payInfo");
+        }
     }
 
 

--
Gitblit v1.8.0