From 3b0d1e8cd140ea6b5502eca54ec94d447ed37b63 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 29 十月 2024 16:25:34 +0800
Subject: [PATCH] 2024-10-29 优化发送验证码接口，优化微信支付功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java | 6 ++++++
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 6 +-----
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java | 26 +++++++++++++-------------
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientSv.java | 1 +
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 5753595..151ef98 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -126,11 +126,7 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) {
try {
- QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
- if (res == null) {
- return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
- }
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(intakeSv.getIntakes(vo));
} catch (Exception e) {
log.error("鑾峰彇鍙栨按鍙ｈ褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
index 3a14a0f..50e8a06 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
@@ -112,6 +112,12 @@
return BaseResponseUtils.buildErrorMsg(WechatResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
}
+ Long clientId = clientSv.getClientIdByPhone(phoneNumber);
+ if(clientId == null) {
+ return BaseResponseUtils.buildErrorMsg("璇ユ墜鏈哄彿瀵瑰簲鐨勫啘鎴蜂笉瀛樺湪");
+ }
+
+
// 鐢熸垚6浣嶉獙璇佺爜骞惰浆涓篔son鏍煎紡
String securityCode = String.valueOf(RandomCode.genCode());
JSONObject param = new JSONObject();
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientSv.java
index c5e3adb..08640b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientSv.java
@@ -82,4 +82,5 @@
public Integer unbindWechat(Long sessionId) {
return seOpenIdMapper.deleteByPrimaryKey(sessionId);
}
+
}
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 e31f197..0833021 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
@@ -69,12 +69,12 @@
//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;
- private final String loginUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl;
- private final String notifyUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl;
- private final String grantType = com.dy.pipIrrWechat.wechatpay.PayInfo.grantType;
+ //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;
+ //private final String loginUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl;
+ //private final String notifyUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl;
+ //private final String grantType = com.dy.pipIrrWechat.wechatpay.PayInfo.grantType;
// 骞冲彴璇佷功鍏挜
private final Map CERTIFICATE_MAP = new HashMap();
@@ -109,9 +109,9 @@
queryParams.put("appid", PayInfo.appid);
queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", jsCode);
- queryParams.put("grant_type", grantType);
+ queryParams.put("grant_type", com.dy.pipIrrWechat.wechatpay.PayInfo.grantType);
Map<String, String> headerParams = new HashMap<>();
- JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);
+ JSONObject job = restTemplateUtil.get(com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl, queryParams, headerParams);
if(job.getLong("errcode") != null && job.getLong("errcode") >= -1) {
return BaseResponseUtils.buildFail("鐧诲綍鍑瘉鏍￠獙澶辫触");
@@ -163,7 +163,7 @@
Long timestamp = System.currentTimeMillis() / 1000;
byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
- String header = schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);
+ String header = com.dy.pipIrrWechat.wechatpay.PayInfo.schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);
Map<String, String> headers = new HashMap<>();
headers.put("Authorization", header);
@@ -260,10 +260,10 @@
JSONObject job_body = new JSONObject();
job_body.put("appid", PayInfo.appid);
job_body.put("mchid", PayInfo.mchid);
- job_body.put("description", description);
+ job_body.put("description", com.dy.pipIrrWechat.wechatpay.PayInfo.description);
job_body.put("out_trade_no", orderNumber);
job_body.put("attach", DataSourceContext.get());
- job_body.put("notify_url", notifyUrl);
+ job_body.put("notify_url", com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl);
//璁㈠崟閲戦
JSONObject job_amount = new JSONObject();
@@ -285,7 +285,7 @@
String body = job_body.toJSONString();
byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
- String header = schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);
+ String header = com.dy.pipIrrWechat.wechatpay.PayInfo.schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);
Map<String, String> headers = new HashMap<>();
headers.put("Authorization", header);
@@ -333,7 +333,7 @@
job_result.put("timeStamp", timeStamp);
job_result.put("nonceStr", nonceStr);
job_result.put("package", pkg);
- job_result.put("signType", signType);
+ job_result.put("signType", com.dy.pipIrrWechat.wechatpay.PayInfo.signType);
job_result.put("paySign", paySign);
return BaseResponseUtils.buildSuccess(job_result) ;
--
Gitblit v1.8.0