From 8a2a463d46b3dce73015462c9f6a2a258dd25f5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 二月 2022 11:40:11 +0800
Subject: [PATCH] 优化diamante
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 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 66d9a36..9c7a018 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
@@ -19,21 +19,19 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.payment.adapt.IPayAdapt;
-import com.java110.core.factory.ChinaUmsFactory;
+import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.PlutusFactory;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.WechatConstant;
-import com.java110.utils.util.DateUtil;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.bouncycastle.util.encoders.Base64;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -53,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";
@@ -103,24 +102,24 @@
resMap = this.java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openId, smallWeChatDto, notifyUrl);
}
- if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
- resultMap.putAll(JSONObject.toJavaObject(resMap, Map.class));
- resultMap.put("sign",resultMap.get("paySign"));
- } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
- resultMap.put("appId", smallWeChatDto.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("partnerid", smallWeChatDto.getMchId());
- resultMap.put("prepayid", resMap.getString("session_id"));
- //resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
- } else if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
- resultMap.put("prepayId", resMap.getString("session_id"));
- resultMap.put("codeUrl", resMap.getString("qr_code"));
- }
- resultMap.put("code", "0");
- resultMap.put("msg", "涓嬪崟鎴愬姛");
- logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
+ if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
+ resultMap.putAll(JSONObject.toJavaObject(resMap, Map.class));
+ resultMap.put("sign", resultMap.get("paySign"));
+ } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
+ resultMap.put("appId", smallWeChatDto.getAppId());
+ resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
+ resultMap.put("nonceStr", PayUtil.makeUUID(32));
+ resultMap.put("partnerid", smallWeChatDto.getMchId());
+ resultMap.put("prepayid", resMap.getString("session_id"));
+ //resultMap.put("signType", "MD5");
+ resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
+ } else if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
+ resultMap.put("prepayId", resMap.getString("session_id"));
+ resultMap.put("codeUrl", resMap.getString("qr_code"));
+ }
+ resultMap.put("code", "0");
+ resultMap.put("msg", "涓嬪崟鎴愬姛");
+ logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
// } else {
// resultMap.put("code", resMap.getString("errCode"));
// resultMap.put("msg", resMap.getString("errMsg"));
@@ -153,7 +152,7 @@
paramMap.put("openId", openid);
paramMap.put("sn", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
paramMap.put("outTradeId", orderNum);
- if(OwnerAppUserDto.APP_TYPE_WECHAT_MINA.equals(tradeType)){
+ if (OwnerAppUserDto.APP_TYPE_WECHAT_MINA.equals(tradeType)) {
paramMap.put("isMiniProgram", true);
}
paramMap.put("tradeAmount", PayUtil.moneyToIntegerStr(payAmount));
@@ -161,37 +160,49 @@
paramMap.put("notifyUrl", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + paramMap.toJSONString());
+ String privateKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(), "PLUTUS_PRIVATE_KEY");
+ String devId = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "PLUTUS_DEV_ID");
- String param = PlutusFactory.Encryption(paramMap.toJSONString());
+ String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDto.getPayPassword(), devId);
System.out.println(param);
-
- String str = PlutusFactory.post(wechatAuthProperties.getWxPayUnifiedOrder(), 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);
String signature = json.getString("signature");
String content = json.getString("content");
+ String publicKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(), "PLUTUS_PUBLIC_KEY");
//楠岀
- Boolean verify = PlutusFactory.verify256(content, Base64.decode(signature));
+ Boolean verify = PlutusFactory.verify256(content, Base64.decode(signature), publicKey);
//楠岀鎴愬姛
if (!verify) {
throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
}
- //瑙ｅ瘑
- byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
- //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
- String paramOut = new String(bb);
+ //瑙ｅ瘑
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), smallWeChatDto.getPayPassword());
+ //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
+ String paramOut = new String(bb);
- JSONObject paramObj = JSONObject.parseObject(paramOut);
+ JSONObject paramObj = JSONObject.parseObject(paramOut);
logger.debug("缁熶竴涓嬪崟杩斿洖" + paramOut);
- if (paramObj.getString("paramObj") != "00") {
- throw new IllegalArgumentException("鏀粯澶辫触"+paramObj.getString("error"));
+ if (!"00".equals(paramObj.getString("status"))) {
+ 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