From fe3b0f4a3c46892f08421dd4c4d0937fb8a87f93 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 六月 2023 17:55:10 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java | 42 +++++++++---------------------------------
1 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java
index 45376fc..b461926 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java
@@ -85,7 +85,7 @@
private static String SIGN_TYPE = "RSA2";// 鍔犲瘑绠楁硶锛歋M4銆丷SA2
- private static String gzhPayUrl = "https://epaytest.bankofbbg.com/www/corepaycer/WxGzhPay";
+ private static String gzhPayUrl = "https://mbank.bankofbbg.com/www/corepaycer/WxGzhPay";
@Autowired
private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;
@@ -155,36 +155,7 @@
);
- if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
- if (TRADE_TYPE_JSAPI.equals(tradeType)) {
-
- resultMap.put("appId", smallWeChatDto.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
- resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
- } else if (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.get("prepay_id"));
- //resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
- } else if (TRADE_TYPE_NATIVE.equals(tradeType)) {
- resultMap.put("prepayId", resMap.get("prepay_id"));
- resultMap.put("codeUrl", resMap.get("code_url"));
- }
- resultMap.put("code", "0");
- resultMap.put("msg", "涓嬪崟鎴愬姛");
- logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap + "===notifyUrl===" + notifyUrl);
- } else {
- resultMap.put("code", resMap.get("return_code"));
- resultMap.put("msg", resMap.get("return_msg"));
- logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟澶辫触锛屽け璐ュ師鍥�:" + resMap.get("return_msg") + "===code===" + resMap.get("return_code") + "===notifyUrl===" + notifyUrl);
- }
- return resultMap;
+ return resMap;
}
@@ -215,9 +186,14 @@
params.put("asyn_url", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));// 閫氱煡鍦板潃
String decryParams = EncryptDecryptFactory.execute(smallWeChatDto.getObjId(), gzhPayUrl, params);
JSONObject paramOut = JSONObject.parseObject(decryParams);
+ if (!"SUCCESS".equals(paramOut.getString("status"))
+ || !"SUCCESS".equals(paramOut.getString("deal_status"))) {
+ throw new IllegalArgumentException("鏀粯澶辫触" + paramOut.getString("return_message"));
+ }
+
if (!"0000".equals(paramOut.getString("return_code"))
- || !"SUCCESS".equals(paramOut.getString("status"))
- || !"SUCCESS".equals(paramOut.getString("deal_status"))) {
+ && !"0001".equals(paramOut.getString("return_code"))
+ ) {
throw new IllegalArgumentException("鏀粯澶辫触" + paramOut.getString("return_message"));
}
SortedMap<String, String> resultMap = new TreeMap<String, String>();
--
Gitblit v1.8.0