From bfd1ad288092a4b4a010ea230466f5e86a4e3de4 Mon Sep 17 00:00:00 2001 From: lmw <125975490@qq.com> Date: 星期二, 24 十二月 2024 10:09:43 +0800 Subject: [PATCH] fix bug --- app/src/main/java/com/sinata/xqmuse/network/HttpManager.kt | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/sinata/xqmuse/network/HttpManager.kt b/app/src/main/java/com/sinata/xqmuse/network/HttpManager.kt index c2a442c..4f9bb82 100644 --- a/app/src/main/java/com/sinata/xqmuse/network/HttpManager.kt +++ b/app/src/main/java/com/sinata/xqmuse/network/HttpManager.kt @@ -28,17 +28,6 @@ } /** - * 支付 - */ - fun pay( - id: String, - payType: Int, - buyType: Int - ): Flowable<ResultData<PayInfo>> { - return request().pay(id,payType, buyType) - } - - /** * 支付结果 */ fun success( @@ -183,8 +172,8 @@ return request().bankList() } - fun addBank(bank: String,name: String,phone: String,idCard:String,num: String): Flowable<ResultData<Any>> { - return request().addBank(Gson().toJson(BankInfo(bank,num,name,phone,idCard))) + fun addBank(bank: String,name: String,phone: String,idCard:String,num: String,code: String): Flowable<ResultData<Any>> { + return request().addBank(Gson().toJson(BankInfo(bank,num,name,phone,idCard,code))) } fun deleteBank(id: String): Flowable<ResultData<Any>> { @@ -504,6 +493,13 @@ return request().saveCourseStudyHistory(id,isOver,secondLook) } + /** + * 查询支付状态 + */ + fun queryPayment(id: String): Flowable<ResultData<String>> { + return request().queryPayment(id) + } + fun isFirst(): Flowable<ResultData<Boolean>> { return request().isFirst() } @@ -593,8 +589,8 @@ /** * 支付 */ - fun placeOrder(orderFrom:Int,payType:Int,balanceFlag:Int,amount:Double?,receiverId:String?,targetId:String?,vipType:Int?): Flowable<ResultData<PayInfo>> { - return request().placeOrder(orderFrom, payType, balanceFlag, amount, receiverId, targetId, vipType) + fun placeOrder(orderFrom:Int,payType:Int,balanceFlag:Int,amount:Double?,receiverId:String?,targetId:String?,vipType:Int?,orderId:String? = null): Flowable<ResultData<ThirdPayInfo>> { + return request().placeOrder(orderFrom, payType, balanceFlag, amount, receiverId, targetId, vipType,orderId) } /** -- Gitblit v1.7.1