From b48cc4f6b0b711c4e408274ff4737cc7a19ed3de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 14:22:05 +0800
Subject: [PATCH] 游湖阿代码
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 cde020a..ccb819d 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
@@ -30,7 +30,7 @@
import com.java110.utils.util.StringUtil;
import org.bouncycastle.util.encoders.Base64;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -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";
@@ -160,10 +161,16 @@
logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + paramMap.toJSONString());
String privateKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(), "PLUTUS_PRIVATE_KEY");
- String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDto.getPayPassword());
- System.out.println(param);
+ String devId = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "PLUTUS_DEV_ID");
- String str = PlutusFactory.post(wechatAuthProperties.getWxPayUnifiedOrder(), param);
+ String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDto.getPayPassword(), devId);
+ System.out.println(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);
@@ -179,7 +186,7 @@
throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
}
//瑙ｅ瘑
- byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), smallWeChatDto.getPayPassword());
//鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
String paramOut = new String(bb);
@@ -190,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