From 3f4671ee2989dfbb797e3c7bfc1f30aef67ff21b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 六月 2023 18:47:16 +0800
Subject: [PATCH] 哟花返回
---
service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java | 56 +++++++++++++++-----------------------------------------
1 files changed, 15 insertions(+), 41 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 b49712e..4ba84b2 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
@@ -45,15 +45,13 @@
* VALUES ( '9070', '鍖楅儴婀鹃摱琛屾敮浠�', '鍖楅儴婀鹃摱琛屾敮浠�', '2022-08-16 15:51:55', 'community_setting_key', 'setting_type');
* <p>
* INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
- * VALUES ('82', '9070', 'mchtNo_RSA2', 'mchtNo_RSA2', 'mchtNo_RSA2', '2021-10-10 21:25:46', '0');
+ * VALUES ('82', '9070', 'mchtNo_SM4', 'mchtNo_SM4', 'mchtNo_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 ('88', '9070', 'productNo_RSA2', 'productNo_RSA2', 'productNo_RSA2', '2021-10-10 21:25:46', '0');
+ * 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', 'mcht_PrivateKey_RSA2', 'mcht_PrivateKey_RSA2', '鍊艰濉啓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', 'bank_PublicKey_RSA2', 'bank_PublicKey_RSA2', '鍊艰濉啓1 鍏挜 璇峰～鍐欏湪澶囨敞涓� ', '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 ('85', '9070', 'opToken_RSA2', 'opToken_RSA2', 'opToken_RSA2', '2021-10-10 21:25:46', '0');
+ * 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');
@@ -89,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;
@@ -159,36 +157,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;
}
@@ -209,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
@@ -219,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>();
@@ -273,7 +247,7 @@
JSONObject resJson = new JSONObject();
resJson.put("return_code", "SUCCESS");
- resJson.put("return_code", "鎴愬姛");
+ resJson.put("return message", "鎴愬姛");
paymentOrderDto.setResponseEntity(new ResponseEntity<String>(resJson.toJSONString(), HttpStatus.OK));
return paymentOrderDto;
--
Gitblit v1.8.0