|
|
@ -381,22 +381,6 @@ public class OrderSelectionActivity extends AppCompatActivity { |
|
|
|
} |
|
|
|
|
|
|
|
startActivity(intent); |
|
|
|
intent.putExtra("order_type", order.getOrder_type()); |
|
|
|
intent.putExtra("card_no", order.getInfo() != null ? order.getCardNoFromInfo() : ""); |
|
|
|
intent.putExtra("project", order.getProject()); |
|
|
|
intent.putExtra("status", status); |
|
|
|
intent.putExtra("message", message); |
|
|
|
// 添加设备ID和订单类型参数 |
|
|
|
intent.putExtra("hardware_id", hardwareId); |
|
|
|
intent.putExtra("order_type_param", orderType); |
|
|
|
|
|
|
|
// 传递完整的订单数据和核销结果数据 |
|
|
|
intent.putExtra("order_data", new Gson().toJson(order)); |
|
|
|
if (data != null) { |
|
|
|
intent.putExtra("verify_result", new Gson().toJson(data)); |
|
|
|
} |
|
|
|
|
|
|
|
startActivity(intent); |
|
|
|
|
|
|
|
// 准备返回结果给调用Activity |
|
|
|
Intent resultIntent = new Intent(); |
|
|
|