From 4acdf28be7df0b59882de810481f6a8f53fddc87 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 16:42:13 +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/client/ClientCtrl.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
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 6194926..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
@@ -14,6 +14,7 @@
import com.dy.pipIrrWechat.sms.AliyunSmsSv;
import com.dy.pipIrrWechat.sms.RandomCode;
import com.dy.pipIrrWechat.util.RestTemplateUtil;
+import com.dy.pipIrrWechat.wechatpay.PayInfo;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -42,8 +43,8 @@
private final ClientSv clientSv;
private final AliyunSmsSv aliyunSmsSv;
private final RestTemplateUtil restTemplateUtil;
- private final String appid = PayInfo.appid;
- private final String secret = PayInfo.secret;
+ //private final String appid = PayInfo.appid;
+ //private final String secret = PayInfo.secret;
private final String mchid = PayInfo.mchid;
private final String schema = PayInfo.schema;
private final String signType = PayInfo.signType;
@@ -68,8 +69,8 @@
// 鐧诲綍鍑瘉鏍￠獙
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", code);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -110,6 +111,12 @@
if(phoneNumber == null || phoneNumber.length() <= 0) {
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());
@@ -177,8 +184,8 @@
// 鏍￠獙閫氳繃锛岃繘琛岀櫥褰曞嚟璇佹牎楠�
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", code);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -191,7 +198,7 @@
String sessionKey = job.getString("session_key");
Long clientId = clientSv.getClientIdByPhone(phoneNumber);
- String SessionId = "";
+ String sessionId = "";
if(clientId != null) {
// 娣诲姞寰俊鐢ㄦ埛璐︽埛璁板綍
SeOpenId seOpenId = new SeOpenId();
@@ -202,12 +209,12 @@
//Long SessionId = clientSv.addOpenId(seOpenId);
Long rec = clientSv.addOpenId(seOpenId);
if(rec != null) {
- SessionId = String.valueOf(rec);
+ sessionId = String.valueOf(rec);
}
JSONObject job_result = new JSONObject();
job_result.put("clientId", clientId);
- job_result.put("SessionId", SessionId);
+ job_result.put("sessionId", sessionId);
return BaseResponseUtils.buildSuccess(job_result);
} else {
@@ -216,6 +223,26 @@
}
/**
+ * 瑙ｇ粦鍐滄埛涓庡井淇＄殑缁戝畾锛屾牴鎹畇essionId鍒犻櫎缁戝畾璁板綍
+ * @param sessionId
+ * @return
+ */
+ @PostMapping(path = "unbind")
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> unbindWechat(@RequestParam("sessionId")Long sessionId) {
+ if(sessionId == null || sessionId <=0) {
+ return BaseResponseUtils.buildErrorMsg("sessionId鏃犳晥");
+ }
+
+ Integer rec = clientSv.unbindWechat(sessionId);
+ if(rec == null || rec == 0) {
+ return BaseResponseUtils.buildErrorMsg("sessionId閿欒");
+ }
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
* 鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤
* @param sessionId
* @return
--
Gitblit v1.8.0