From 8f8697faa25ee85a4561ba294bad8b31fec5ddaf Mon Sep 17 00:00:00 2001
From: wangsq <944414428@qq.com>
Date: Mon, 8 Apr 2024 10:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ynxbd/common/action/PWEAction.java    | 14 ++++++++-----
 src/main/java/com/ynxbd/wx/pwe/PWEHelper.java | 20 ++++++++++++-------
 src/main/resources/pwe.properties             |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ynxbd/common/action/PWEAction.java b/src/main/java/com/ynxbd/common/action/PWEAction.java
index 99abab2..c85effe 100644
--- a/src/main/java/com/ynxbd/common/action/PWEAction.java
+++ b/src/main/java/com/ynxbd/common/action/PWEAction.java
@@ -42,8 +42,8 @@ public class PWEAction extends BaseAction {
             if (ObjectUtils.isEmpty(registerId)) {
                 return Result.error(ResultEnum.PARAM_IS_BLANK);
             }
-            String miniPWEUrl = PWEHelper.getMiniPWEUrl(registerId);
-            return Result.success(miniPWEUrl);
+            String url = PWEHelper.getMiniPWEUrl(registerId);
+            return Result.success(url);
         } catch (Exception e) {
             return Result.error(e);
         }
@@ -60,8 +60,12 @@ public class PWEAction extends BaseAction {
             if (ObjectUtils.isEmpty(registerId)) {
                 return Result.error(ResultEnum.PARAM_IS_BLANK);
             }
-            String miniPWEUrl = PWEHelper.getH5PWEUrl(registerId, openid);
-            return Result.success(miniPWEUrl);
+            String url = PWEHelper.getH5PWEUrl(registerId, openid);
+            if (ObjectUtils.isEmpty(url)) {
+                log.info("[预问诊][患者端]获取预问诊H5链接失败 registerId={}, openid={}", registerId, openid);
+                return Result.error("获取链接失败");
+            }
+            return Result.success(url);
         } catch (Exception e) {
             return Result.error(e);
         }
@@ -112,7 +116,7 @@ public class PWEAction extends BaseAction {
             log.info("[预问诊]6.3 预问诊完成通知 partnerId={}, hospitalId={}, registeredId={}, progress={}", partnerId, hospitalId, registeredId, progress);
             if ("1".equals(progress)) {
                 log.info("[预问诊]报告生成进度100%");
-                MessagePushConfig.regAIReport(order.getPatientId(),order.getOutTradeNo(),order.getOpenid());
+                MessagePushConfig.regAIReport(order.getPatientId(), order.getOutTradeNo(), order.getOpenid());
             }
             return PWEResult.success();
         } catch (Exception e) {
diff --git a/src/main/java/com/ynxbd/wx/pwe/PWEHelper.java b/src/main/java/com/ynxbd/wx/pwe/PWEHelper.java
index ddc6f93..af92c83 100644
--- a/src/main/java/com/ynxbd/wx/pwe/PWEHelper.java
+++ b/src/main/java/com/ynxbd/wx/pwe/PWEHelper.java
@@ -68,15 +68,21 @@ public class PWEHelper {
      * @param registerId 挂号ID（商户订单号 outTradeNo）
      */
     public static String getH5PWEUrl(String registerId, String openid) {
-        log.info("[患者端]获取预问诊h5链接 registerId={}", registerId);
-        String registerIdSign = toHmacSha256Example(PWEConfig.SECRET_KEY, (PWEConfig.HOSPITAL_ID + registerId));
-        if (ObjectUtils.isEmpty(registerIdSign)) {
-            log.error("[患者端]获取预问诊h5链接,签名失败");
-            return null;
-        }
         // 测试环境，并且未找到用户
         if (PWEConfig.IS_DEV && !PWEConfig.hasOpenId(openid)) {
-            log.error("[患者端]测试环境未找到用户 openid={}", openid);
+            log.warn("[预问诊][患者端]测试环境 registerId={}, openid={}", registerId, openid);
+            return null;
+        }
+
+        log.info("[预问诊][患者端]获取预问诊h5链接 registerId={}, openid={}", registerId, openid);
+        if (ObjectUtils.isEmpty(registerId) || ObjectUtils.isEmpty(openid)) {
+            log.error("[预问诊][患者端]请求参数为空 registerId={}, openid={}", registerId, openid);
+            return null;
+        }
+
+        String registerIdSign = toHmacSha256Example(PWEConfig.SECRET_KEY, (PWEConfig.HOSPITAL_ID + registerId));
+        if (ObjectUtils.isEmpty(registerIdSign)) {
+            log.error("[预问诊][患者端]获取预问诊h5链接,签名失败 registerId={}, openid={}", registerId, openid);
             return null;
         }
         String params = URLHelper.mapToUrl(map -> {
diff --git a/src/main/resources/pwe.properties b/src/main/resources/pwe.properties
index 363d502..a41ce19 100644
--- a/src/main/resources/pwe.properties
+++ b/src/main/resources/pwe.properties
@@ -9,4 +9,4 @@ pwe.secret_key=ZLU6bW&x#%k@2kxW
 # dev==================
 pwe.dev.partner_secret=ad99d34eb89b5fb517380ff4745ada1e
 pwe.dev.secret_key=P*HEi#aNN8hJ6*EA
-pwe.dev.open_ids=1,2
\ No newline at end of file
+pwe.dev.open_ids=oeso-t62kkoRwLVVkSkwmmjPfUXk
\ No newline at end of file