From 350cefac02d9c93d3874ceedd460892ff09de161 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 六月 2023 18:26:48 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 bf2ab78..603065a 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
@@ -49,7 +49,9 @@
* INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
* VALUES ('88', '9070', 'productNo_SM4', 'productNo_SM4', 'productNo_SM4', '2021-10-10 21:25:46', '0');
* INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
- * VALUES ('83', '9070', 'publicKey_SM4', 'publicKey_SM4', '鍊艰濉啓1 绉侀挜 璇峰～鍐欏湪澶囨敞涓�', '2021-10-10 21:25:46', '0');
+ * VALUES ('83', '9070', 'publicKey_SM4', 'publicKey_SM4', '鍊艰濉啓 鍏挜 ', '2021-10-10 21:25:46', '0');
+ * INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
+ * VALUES ('84', '9070', 'privateKey_SM4', 'privateKey_SM4', '鍊艰濉啓 绉侀挜 ', '2021-10-10 21:25:46', '0');
* // 浠ヤ笅鏁版嵁鍏堟煡璇㈡槸鍚﹀瓨鍦� 瀛樺湪鍒欎慨鏀� 涓嶅瓨鍦ㄦ坊鍔�
* INSERT INTO `TT`.`c_mapping` (`domain`, `name`, `key`, `value`, `remark`, `create_time`, `status_cd`)
* VALUES ('WECHAT', '琚壂鏀粯鍘傚', 'PAY_QR_ADAPT', 'qrCodeBbgPaymentAdapt', '', '2023-02-18 18:47:14', '0');
@@ -85,7 +87,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;
@@ -176,7 +178,7 @@
params.put("mcht_no", mchtNo_SM4);// 鏀舵鍟嗘埛缂栧彿
params.put("product_no", productNo_SM4);// 浜у搧缂栧彿
params.put("biz_type", "WX_GZH");// 涓氬姟绫诲瀷
- params.put("tran_no", String.valueOf(System.nanoTime()));// 鍟嗘埛娴佹按
+ params.put("tran_no", orderNum);// 鍟嗘埛娴佹按
params.put("code", "");// 鎺堟潈鐮�
params.put("openid", openid);// 鐢ㄦ埛鏍囪瘑id
params.put("appid", smallWeChatDto.getAppId());// 鍏紬鍙穉ppid
@@ -186,9 +188,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