From 025a00ac9afba5dfe763f472ec7bc97c1e080a0b Mon Sep 17 00:00:00 2001 From: MTing Date: Thu, 18 Sep 2025 14:38:12 +0800 Subject: [PATCH] test 19 fix --- .../oxface/network/OrderVerificationResultHandler.java | 1 + .../oxface/orderOX/OrderVerificationResultActivity.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java b/app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java index 5af2cf7..d8cf67d 100644 --- a/app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java +++ b/app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java @@ -118,6 +118,7 @@ public class OrderVerificationResultHandler { // 创建跳转到OrderVerificationResultActivity的Intent android.content.Intent intent = new android.content.Intent(context, OrderVerificationResultActivity.class); intent.putExtra("verification_type", verificationType); + intent.putExtra("order_type", -1); // 设置orderType为-1表示无订单数据 intent.putExtra("status", "核销失败"); intent.putExtra("message", errorMessage != null ? errorMessage : "未找到订单信息"); intent.putExtra("error_code", errorCode); diff --git a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java index 33f1b4c..d04f9af 100644 --- a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java @@ -200,6 +200,8 @@ public class OrderVerificationResultActivity extends AppCompatActivity { return "年月卡"; case 5: return "课程"; + case -1: + return ""; // 当orderType为-1时返回空字符串 default: return "orderType:" + orderType; } @@ -233,8 +235,10 @@ public class OrderVerificationResultActivity extends AppCompatActivity { if (project != null && !project.isEmpty()) { orderTypeTitle += " - " + project; } - tvTitle.setText(tvTitle.getText() + " (" + orderTypeTitle + ")"); - + if(!orderTypeTitle.isEmpty()||!orderTypeTitle.equals("")){ + tvTitle.setText(tvTitle.getText() + " (" + orderTypeTitle + ")"); + } + // 设置状态信息 tvStatus.setText(status); tvMessage.setText(message); @@ -497,8 +501,12 @@ public class OrderVerificationResultActivity extends AppCompatActivity { * 添加基本订单信息(包含验证码) */ private void addBasicOrderInfoWithVerificationCode() { + + if(!orderNo.isEmpty()){ + orderNo = "暂无"; + } addInfoRow("订单编号", orderNo); - + // 从verifyResult中获取验证码,而不是使用verificationCode变量 String displayVerificationCode = verificationCode; if (verifyResult != null && verifyResult.getVCode() != null && !verifyResult.getVCode().isEmpty()) {