From f5bae38b42e226ebd2c4d777049e1da33be43845 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 20 Jul 2021 17:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/controller/OrderInfoController.java | 4 ++-- src/main/resources/templates/findOrder.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index ea7e891..cb5c34b 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -79,8 +79,8 @@ public class OrderInfoController { if(serverId1 != 0 && serverId1 != serverId) { continue; } - String ccId = cgPayOrder.getCc_id(); - if (ccId != null && !ccId.equals(packId)){ + String ccId = Optional.ofNullable(cgPayOrder.getCc_id()).orElse(""); + if (!packId.equals("ALLORDER") && !ccId.equals(packId)){ continue; } String accountid = cgPayOrder.getUserId(); diff --git a/src/main/resources/templates/findOrder.html b/src/main/resources/templates/findOrder.html index 8782c5c..12fc26a 100644 --- a/src/main/resources/templates/findOrder.html +++ b/src/main/resources/templates/findOrder.html @@ -75,6 +75,7 @@ 游戏名称: