diff --git a/app/src/main/java/com/ouxuan/oxface/network/api/PadApiService.java b/app/src/main/java/com/ouxuan/oxface/network/api/PadApiService.java index a57ff4e..1ff1d05 100644 --- a/app/src/main/java/com/ouxuan/oxface/network/api/PadApiService.java +++ b/app/src/main/java/com/ouxuan/oxface/network/api/PadApiService.java @@ -1132,10 +1132,14 @@ public interface PadApiService { @SerializedName("verify_code") private String verifyCode; // 核销码 - public VerifyOrderRequest(String token, String orderId, String verifyCode) { + @SerializedName("type") + private int type; // 验证类型 1验证码验证 2人脸验证 3扫码验证 4扫码器验证 + + public VerifyOrderRequest(String token, String orderId, String verifyCode, int type) { this.token = token; this.orderId = orderId; this.verifyCode = verifyCode; + this.type = type; } // Getters and Setters @@ -1147,6 +1151,9 @@ public interface PadApiService { public String getVerifyCode() { return verifyCode; } public void setVerifyCode(String verifyCode) { this.verifyCode = verifyCode; } + + public int getType() { return type; } + public void setType(int type) { this.type = type; } } /** diff --git a/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java b/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java index 0df9b93..a0bbd88 100644 --- a/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java +++ b/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java @@ -717,16 +717,17 @@ public class NetworkUtils { * @param token 访问令牌 * @param orderId 订单ID * @param verifyCode 核销码 + * @param type 验证类型 1验证码验证 2人脸验证 3扫码验证 4扫码器验证 * @param callback 回调接口 */ - public static void verifyOrder(String token, String orderId, String verifyCode, + public static void verifyOrder(String token, String orderId, String verifyCode, int type, NetworkCallback callback) { if (padApiService == null) { callback.onError(-1, "NetworkUtils未初始化,请先调用init()方法"); return; } - PadApiService.VerifyOrderRequest request = new PadApiService.VerifyOrderRequest(token, orderId, verifyCode); + PadApiService.VerifyOrderRequest request = new PadApiService.VerifyOrderRequest(token, orderId, verifyCode, type); callback.onStart(); padApiService.verifyOrder(request).enqueue(new Callback>() { @@ -763,6 +764,21 @@ public class NetworkUtils { } /** + * 核销订单(向后兼容版本,默认type=1) + * @param token 访问令牌 + * @param orderId 订单ID + * @param verifyCode 核销码 + * @param callback 回调接口 + * @deprecated 请使用带type参数的版本 + */ + @Deprecated + public static void verifyOrder(String token, String orderId, String verifyCode, + NetworkCallback callback) { + // 默认使用验证码验证类型 + verifyOrder(token, orderId, verifyCode, 1, callback); + } + + /** * 获取小程序码 * @param token 访问令牌 * @param hardwareId 硬件ID diff --git a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java index eda4c0e..356b236 100644 --- a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java @@ -280,16 +280,17 @@ public class OrderSelectionActivity extends AppCompatActivity { return; } - LogManager.logInfo(TAG, "调用核销接口: orderId=" + orderId + ", verifyCode=" + verifyCode); + LogManager.logInfo(TAG, "调用核销接口: orderId=" + orderId + ", verifyCode=" + verifyCode + ", type=" + verificationType); // 显示加载状态 showToast("正在核销订单,请稍候..."); - // 调用NetworkUtils.verifyOrder接口进行实际核销 + // 调用NetworkUtils.verifyOrder接口进行实际核销,传递verificationType参数 com.ouxuan.oxface.network.utils.NetworkUtils.verifyOrder( token, orderId, verifyCode, + verificationType, // 传递验证类型参数 new com.ouxuan.oxface.network.callback.NetworkCallback() { @Override