fix bug

杨锴

2024-11-11 9e77b0f9014653255eb51e81b8a8ba719443839d

 XQMuse/Root/Network/Services.swift

@@ -14,6 +14,7 @@

#if DEBUG
let All_Url = "https://xq.xqzhihui.com/api"
//let All_Url = "http://192.168.110.64:9000"
//let All_Url = "https://mock.apipost.net/mock/31b303c60464000"
#else
let All_Url = "https://xq.xqzhihui.com/api"
@@ -348,6 +349,40 @@
            .append(key: "receiverId", value: receiverId)
        return NetworkRequest.request(params: params, method: .post, progress: true)
    }

    class func gvieCourseAgain(orderForm:PaymentOrderVC.PaymentOrderType,id:Int)->Observable<BaseResponse<SimpleModel>>{
        let params = ParamsAppender.build(url: All_Url)
        params.interface(url: "/order/client/order/order/payOrder")
            .append(key: "id", value: id)
            .append(key: "type", value: 2)
        return NetworkRequest.request(params: params, method: .post, progress: true)
    }

    class func cancelOrder(id:Int)->Observable<BaseResponse<SimpleModel>>{
        let params = ParamsAppender.build(url: All_Url)
        params.interface(url: "/order/mgt/order/order/cancel")
            .append(key: "uid", value: id)
        return NetworkRequest.request(params: params, method: .get, progress: true)
    }


    /// 苹果支付
    /// - Parameters:
    ///   - amount: 购买会员的金额/充值金额
    ///   - balanceFlag:     是否使用余额抵扣 1=是 2=否
    ///   - orderFrom:     订单来源 1=冥想音频 2=课程 3=购买会员 4充值
    ///   - transactionIdentifier:         苹果订单id
    ///   - vipType: 订单类型为会员时 必传 会员类型 1月度 2季度 3年度
    class func placeOrderApple(amount:Double,balanceFlag:ConditionType,orderFrom:Int,transactionIdentifier:String,vipType:Int?)->Observable<BaseResponse<SimpleModel>>{
        let params = ParamsAppender.build(url: All_Url)
        params.interface(url: "/order/client/order/order/placeOrderApple")
            .append(key: "amount", value: amount)
            .append(key: "balanceFlag", value: balanceFlag.rawValue)
            .append(key: "orderFrom", value: orderFrom)
            .append(key: "transactionIdentifier", value: transactionIdentifier)
            .append(key: "vipType", value: vipType)
        return NetworkRequest.request(params: params, method: .post, progress: false)
    }
}

/// 疗愈馆
@@ -382,15 +417,15 @@
                        params.interface(url: "/user/client/app-user/getUserByPhone")
                                    .append(key: "phone", value: phone)
                                    .append(key: "apipost_id", value: "2e763463799135")
                        return NetworkRequest.request(params: params, method: .post, progress: true)
        return NetworkRequest.request(params: params, method: .post, progress: true,ignoreAlert: true)
            }

            /// 获取用户信息
            class func getUserDetail()->Observable<BaseResponse<UserInfoModel>>{
    class func getUserDetail(showProgress:Bool = true)->Observable<BaseResponse<UserInfoModel>>{
                        let params = ParamsAppender.build(url: All_Url)
                        params.interface(url: "/user/client/app-user/getUserDetail")
                                    .append(key: "apipost_id", value: "2fc350e9799588")
                        return NetworkRequest.request(params: params, method: .post, progress: false)
        return NetworkRequest.request(params: params, method: .post, progress: showProgress,ignoreAlert: true)
            }

            /// 获取用户信息
@@ -476,11 +511,11 @@
                        return NetworkRequest.request(params: params, method: .post, progress: true)
            }

            class func myWallet()->Observable<BaseResponse<WalletModel>>{
    class func myWallet(showprogress: Bool = false)->Observable<BaseResponse<WalletModel>>{
                        let params = ParamsAppender.build(url: All_Url)
                        params.interface(url: "/user/client/app-user/wallet")
                                    .append(key: "apipost_id", value: "3518e3f0b99420")
                        return NetworkRequest.request(params: params, method: .post, progress: false)
        return NetworkRequest.request(params: params, method: .post, progress: showprogress,ignoreAlert: true)
            }

            class func getMyBankList()->Observable<BaseResponse<[BankInfoModel]>>{