From b8d8f9b855fdd453d06d78d2565f091db208ec8e Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 26 十一月 2024 19:30:59 +0800
Subject: [PATCH] 支付
---
app/src/main/java/com/sinata/xqmuse/network/HttpManager.kt | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 ed967b6..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>> {
@@ -320,15 +309,15 @@
/**
* 验证码登录
*/
- fun captchaLogin(code: String, phone: String): Flowable<ResultData<LoginBean>> {
- return request().captchaLogin("{\"cellPhone\":\"${phone}\",\"captcha\":\"${code}\"}")
+ fun captchaLogin(device: String, code: String, phone: String): Flowable<ResultData<LoginBean>> {
+ return request().captchaLogin("{\"device\":\"${device}\",\"cellPhone\":\"${phone}\",\"captcha\":\"${code}\"}")
}
/**
* wx登录
*/
- fun wxLogin(openid: String?, name: String?,sex: Int?,avatar: String?): Flowable<ResultData<WxLoginBean>> {
- return request().wxLogin(Gson().toJson(ReqWxLogin(avatar,name,sex,openid)))
+ fun wxLogin(device: String, openid: String?, name: String?,sex: Int?,avatar: String?): Flowable<ResultData<WxLoginBean>> {
+ return request().wxLogin(Gson().toJson(ReqWxLogin(device,avatar,name,sex,openid)))
}
/**
@@ -451,6 +440,21 @@
}
/**
+ * 待支付订单
+ */
+ fun payOrder(id: String): Flowable<ResultData<ConfirmOrder>> {
+ return request().payOrder(id)
+ }
+
+
+ /**
+ * 取消订单
+ */
+ fun cancel(id: String): Flowable<ResultData<Any>> {
+ return request().cancel(id)
+ }
+
+ /**
* 确认订单
*/
fun confirmOrderVoice(id: String): Flowable<ResultData<ConfirmOrder>> {
@@ -487,6 +491,13 @@
*/
fun saveCourseStudyHistory(id: String,isOver:Int,secondLook:Int): Flowable<ResultData<Any>> {
return request().saveCourseStudyHistory(id,isOver,secondLook)
+ }
+
+ /**
+ * 查询支付状态
+ */
+ fun queryPayment(id: String): Flowable<ResultData<String>> {
+ return request().queryPayment(id)
}
fun isFirst(): Flowable<ResultData<Boolean>> {
@@ -578,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