From f84526df5d2b7fb29ad0202b61254c815ba33ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= <absorber@absorber.local>
Date: Thu, 16 Nov 2023 09:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BD=93=E6=A3=80=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ynxbd/wx/servlet/QServlet.java         | 8 ++++++--
 src/main/java/com/ynxbd/wx/wxfactory/ReqParamHelper.java | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ynxbd/wx/servlet/QServlet.java b/src/main/java/com/ynxbd/wx/servlet/QServlet.java
index cd71886..6f7f00b 100644
--- a/src/main/java/com/ynxbd/wx/servlet/QServlet.java
+++ b/src/main/java/com/ynxbd/wx/servlet/QServlet.java
@@ -49,10 +49,14 @@ public class QServlet extends HttpServlet {
 
         String patientId = request.getParameter("p");
         log.info("{} [patientId={}]多张处方扫码请求，开始解析...", merchantEnum.NAME, patientId);
-        if (StringUtils.isEmpty(patientId)) {
-            log.info("[支付] 多张扫码请求 patientId is null");
+        if (StringUtils.isEmpty(patientId)&&StringUtils.isEmpty(request.getParameter("t"))) {
+            log.info("[支付] 多张扫码请求 patientId is null and idCardNo is null");
             return;
         }
+        // 体检缴费，patientId赋值为0
+        if(!StringUtils.isEmpty(request.getParameter("t"))&&StringUtils.isEmpty(patientId)){
+            patientId = "0"; //patientId 赋值0
+        }
 
         if (MerchantEnum.WX.equals(merchantEnum)) {
             response.sendRedirect(WeChatConfig.getWebUrl() + "pay-qr-recipe.html?p=" + patientId + "&enp=" + ReqParamHelper.encode(patientId)+ "&ent=" + request.getParameter("t"));
diff --git a/src/main/java/com/ynxbd/wx/wxfactory/ReqParamHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/ReqParamHelper.java
index db6776c..b6f1f0b 100644
--- a/src/main/java/com/ynxbd/wx/wxfactory/ReqParamHelper.java
+++ b/src/main/java/com/ynxbd/wx/wxfactory/ReqParamHelper.java
@@ -21,7 +21,7 @@ public class ReqParamHelper {
     }
 
     public static void main(String[] args) {
-        System.out.println(encode("30105880"));
+        System.out.println(encode("0"));
         System.out.println(decode("5AE40D74FFF8C3F14A0491F8824C61EE"));
     }
 }