From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java | 41 +++++++----------------------------------
1 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
index e757992..e31f197 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
@@ -66,9 +66,9 @@
private final RestTemplateUtil restTemplateUtil;
private final PayHelper payHelper;
private final VirtualCardSv virtualCardSv;
- private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;
- private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;
- private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;
+ //private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;
+ //private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;
+ //private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;
private final String schema = com.dy.pipIrrWechat.wechatpay.PayInfo.schema;
private final String signType = com.dy.pipIrrWechat.wechatpay.PayInfo.signType;
private final String description = com.dy.pipIrrWechat.wechatpay.PayInfo.description;
@@ -106,8 +106,8 @@
String jsCode = code2Session.getJs_code();
Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
+ queryParams.put("appid", PayInfo.appid);
+ queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", jsCode);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -258,8 +258,8 @@
}
JSONObject job_body = new JSONObject();
- job_body.put("appid", appid);
- job_body.put("mchid", mchid);
+ job_body.put("appid", PayInfo.appid);
+ job_body.put("mchid", PayInfo.mchid);
job_body.put("description", description);
job_body.put("out_trade_no", orderNumber);
job_body.put("attach", DataSourceContext.get());
@@ -561,32 +561,5 @@
return BaseResponseUtils.buildFail("娣诲姞寰俊鏀粯淇℃伅澶辫触");
}
return BaseResponseUtils.buildSuccess(true) ;
- }
-
- /**
- * 鍒濆鍖栧井淇℃敮浠樹俊鎭�
- * @param appId
- * @return
- */
- @PostMapping(path = "init_wechatpay")
- public BaseResponse<Boolean> initWechatpay(@RequestParam("appId") String appId) throws Exception {
- if(appId == null || appId.trim().length() == 0) {
- return BaseResponseUtils.buildErrorMsg("灏忕▼搴忓敮涓�鏍囪瘑涓嶈兘涓虹┖");
- }
- appId = AES.encrypt(appId);
-
- SeWechatpay seWechatpay = paymentSv.getWechatpayByAppId(appId);
- if(seWechatpay != null) {
- PayInfo.appid = AES.decrypt(seWechatpay.getAppId());
- PayInfo.secret = AES.decrypt(seWechatpay.getAppSecret());
- PayInfo.mchid = AES.decrypt(seWechatpay.getMchId());
- PayInfo.key = AES.decrypt(seWechatpay.getMchKey());
- PayInfo.serial_no = AES.decrypt(seWechatpay.getSerialNo());
- PayInfo.notifyUrl = AES.decrypt(seWechatpay.getNotifyUrl());
- return BaseResponseUtils.buildSuccess(true) ;
- }else {
- return BaseResponseUtils.buildErrorMsg("灏忕▼搴忓敮涓�鏍囪瘑閿欒鎴栧叾淇℃伅涓嶅瓨鍦�");
- }
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0