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 08c6fc6..9e3dc0c 100644 --- a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java @@ -259,7 +259,7 @@ public class OrderVerificationResultActivity extends AppCompatActivity { } // 添加基本信息 - addBasicOrderInfo(); + addBasicOrderInfoWithVerificationCode(); } /** @@ -267,7 +267,12 @@ public class OrderVerificationResultActivity extends AppCompatActivity { */ private void buildPeopleContent() { // 人次核销:显示验证码、订单编号、有效时间、预订信息 - addInfoRow("验证码", formatVerificationCode(verificationCode)); + // 从verifyResult中获取验证码,而不是使用verificationCode变量 + String displayVerificationCode = verificationCode; + if (verifyResult != null && verifyResult.getVCode() != null && !verifyResult.getVCode().isEmpty()) { + displayVerificationCode = verifyResult.getVCode().get(0); + } + addInfoRow("验证码", formatVerificationCode(displayVerificationCode)); addInfoRow("订单编号", orderNo); // 获取有效时间 @@ -289,7 +294,12 @@ public class OrderVerificationResultActivity extends AppCompatActivity { */ private void buildCardContent() { // 年月卡:显示验证码、名称、卡号、核销方式、核销时间 - addInfoRow("验证码", formatVerificationCode(verificationCode)); + // 从verifyResult中获取验证码,而不是使用verificationCode变量 + String displayVerificationCode = verificationCode; + if (verifyResult != null && verifyResult.getVCode() != null && !verifyResult.getVCode().isEmpty()) { + displayVerificationCode = verifyResult.getVCode().get(0); + } + addInfoRow("验证码", formatVerificationCode(displayVerificationCode)); addInfoRow("名称", project != null ? project : "-"); if (orderInfo != null && orderInfo.isJsonObject()) { @@ -325,11 +335,18 @@ public class OrderVerificationResultActivity extends AppCompatActivity { addInfoRow("课程名称", project != null ? project : "-"); addInfoRow("订单编号", orderNo); + // 从verifyResult中获取验证码和核销信息,而不是使用verificationCode变量 + String displayVerificationCode = verificationCode; + if (verifyResult != null && verifyResult.getVCode() != null && !verifyResult.getVCode().isEmpty()) { + displayVerificationCode = verifyResult.getVCode().get(0); + } + if (orderInfo != null && orderInfo.isJsonObject()) { JsonObject courseInfo = orderInfo.getAsJsonObject(); String verifyDesc = getJsonString(courseInfo, "verify_desc", "-"); String verifyTime = getJsonString(courseInfo, "verify_time", "-"); + addInfoRow("签到码", formatVerificationCode(displayVerificationCode)); // 添加签到码显示 addInfoRow("签到方式", verifyDesc); addInfoRow("签到时间", verifyTime); } @@ -339,7 +356,7 @@ public class OrderVerificationResultActivity extends AppCompatActivity { * 构建默认内容 */ private void buildDefaultContent() { - addBasicOrderInfo(); + addBasicOrderInfoWithVerificationCode(); } /** @@ -359,6 +376,29 @@ public class OrderVerificationResultActivity extends AppCompatActivity { } /** + * 添加基本订单信息(包含验证码) + */ + private void addBasicOrderInfoWithVerificationCode() { + addInfoRow("订单编号", orderNo); + + // 从verifyResult中获取验证码,而不是使用verificationCode变量 + String displayVerificationCode = verificationCode; + if (verifyResult != null && verifyResult.getVCode() != null && !verifyResult.getVCode().isEmpty()) { + displayVerificationCode = verifyResult.getVCode().get(0); + } + + if (displayVerificationCode != null && !displayVerificationCode.isEmpty()) { + addInfoRow("验证码", formatVerificationCode(displayVerificationCode)); + } + if (cardNo != null && !cardNo.isEmpty()) { + addInfoRow("卡号", cardNo); + } + if (project != null && !project.isEmpty()) { + addInfoRow("项目", project); + } + } + + /** * 添加信息行 */ private void addInfoRow(String label, String value) {