Browse Source

test 19 fix

devab
MTing 4 weeks ago
parent
commit
025a00ac9a
  1. 1
      app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java
  2. 10
      app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java

1
app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java

@ -118,6 +118,7 @@ public class OrderVerificationResultHandler {
// 创建跳转到OrderVerificationResultActivity的Intent // 创建跳转到OrderVerificationResultActivity的Intent
android.content.Intent intent = new android.content.Intent(context, OrderVerificationResultActivity.class); android.content.Intent intent = new android.content.Intent(context, OrderVerificationResultActivity.class);
intent.putExtra("verification_type", verificationType); intent.putExtra("verification_type", verificationType);
intent.putExtra("order_type", -1); // 设置orderType为-1表示无订单数据
intent.putExtra("status", "核销失败"); intent.putExtra("status", "核销失败");
intent.putExtra("message", errorMessage != null ? errorMessage : "未找到订单信息"); intent.putExtra("message", errorMessage != null ? errorMessage : "未找到订单信息");
intent.putExtra("error_code", errorCode); intent.putExtra("error_code", errorCode);

10
app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java

@ -200,6 +200,8 @@ public class OrderVerificationResultActivity extends AppCompatActivity {
return "年月卡"; return "年月卡";
case 5: case 5:
return "课程"; return "课程";
case -1:
return ""; // 当orderType为-1时返回空字符串
default: default:
return "orderType:" + orderType; return "orderType:" + orderType;
} }
@ -233,7 +235,9 @@ public class OrderVerificationResultActivity extends AppCompatActivity {
if (project != null && !project.isEmpty()) { if (project != null && !project.isEmpty()) {
orderTypeTitle += " - " + project; orderTypeTitle += " - " + project;
} }
tvTitle.setText(tvTitle.getText() + " (" + orderTypeTitle + ")");
if(!orderTypeTitle.isEmpty()||!orderTypeTitle.equals("")){
tvTitle.setText(tvTitle.getText() + " (" + orderTypeTitle + ")");
}
// 设置状态信息 // 设置状态信息
tvStatus.setText(status); tvStatus.setText(status);
@ -497,6 +501,10 @@ public class OrderVerificationResultActivity extends AppCompatActivity {
* 添加基本订单信息包含验证码 * 添加基本订单信息包含验证码
*/ */
private void addBasicOrderInfoWithVerificationCode() { private void addBasicOrderInfoWithVerificationCode() {
if(!orderNo.isEmpty()){
orderNo = "暂无";
}
addInfoRow("订单编号", orderNo); addInfoRow("订单编号", orderNo);
// 从verifyResult中获取验证码而不是使用verificationCode变量 // 从verifyResult中获取验证码而不是使用verificationCode变量

Loading…
Cancel
Save