From f383b23ad9c94086d7b32dd77c2b13e35adf99f4 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 27 Feb 2024 12:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=94=AF=E4=BB=98=E5=AE=9D&?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chwl/app/ui/im/RouterHandler.java | 3 - .../app/ui/webview/CommonWebViewFragment.java | 14 - .../chwl/core/im/custom/bean/RouterType.java | 65 ---- .../com/chwl/core/initial/InitialModel.java | 7 - .../java/com/chwl/core/pay/IPayModel.java | 40 --- .../main/java/com/chwl/core/pay/PayModel.java | 301 ------------------ .../chwl/core/withdraw/IWithdrawModel.java | 42 --- .../com/chwl/core/withdraw/WithdrawModel.java | 276 ---------------- .../chwl/core/withdraw/bean/BindAliInfo.java | 18 -- .../chwl/core/withdraw/bean/RefreshInfo.java | 8 - .../withdraw/event/ExchangeInfoEvent.java | 18 -- .../withdraw/event/WithdrawInfoEvent.java | 17 - 12 files changed, 809 deletions(-) delete mode 100644 core/src/main/java/com/chwl/core/withdraw/IWithdrawModel.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/WithdrawModel.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/bean/BindAliInfo.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/bean/RefreshInfo.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/event/ExchangeInfoEvent.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/event/WithdrawInfoEvent.java diff --git a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java index c5cd1635f..56d10e459 100644 --- a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java +++ b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java @@ -2,8 +2,6 @@ package com.chwl.app.ui.im; import android.annotation.SuppressLint; import android.content.Context; -import android.content.Intent; -import android.os.Bundle; import com.chwl.app.earn.activity.EarnRecordActivity; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; @@ -52,7 +50,6 @@ import com.chwl.core.room.bean.RoomInfo; import com.chwl.core.room.model.AvRoomModel; import com.chwl.core.utils.net.BeanObserver; import com.chwl.core.utils.net.RxHelper; -import com.chwl.core.withdraw.WithdrawModel; import com.chwl.library.net.rxnet.callback.CallBack; import com.chwl.library.utils.JavaUtil; import com.chwl.library.utils.ResUtil; diff --git a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java index f2f299ad8..06ed4aa31 100644 --- a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java +++ b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java @@ -47,20 +47,6 @@ public class CommonWebViewFragment extends BaseBindingFragment { - Uri alipayUrl = Uri.parse("https://d.alipay.com"); - CommonWebViewFragment.this.startActivity(new Intent("android.intent.action.VIEW", alipayUrl)); - }).setNegativeButton(ResUtil.getString(R.string.ui_webview_commonwebviewfragment_03), null).show(); - } - return true; - } if (url.contains("tel:")) { //删除直接拨打电话的功能 return true; diff --git a/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java b/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java index f4318bdbf..314c6c929 100644 --- a/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java @@ -15,16 +15,6 @@ public class RouterType { */ public static final int H5 = 2; - /** - * 3-钱包页； - */ - public static final int WALLET = 3; - - /** - * 4-红包； - */ - public static final int RED = 4; - /** * 5-充值页； */ @@ -65,30 +55,11 @@ public class RouterType { */ public static final int TEAM = 11; - /** - * 背景 - */ - public static final int BG = 12; - - /** - * 星秀玩友 - */ - public static final int NEW_USER = 13; - /** - * 邀请 - */ - public static final int INVITATION = 14; - /** * 公聊大厅 */ public static final int PUBLIC_CHAT_HALL = 15; - /** - * 绑定 支付宝 账号 - */ - public static final int BINDING_ALI_PAY_ACCOUNT = 16; - /** * 绑定手机号 */ @@ -131,15 +102,6 @@ public class RouterType { public static final int PERSION_SETTING = 30; - /** - * 弹窗 - */ - public static final int POP_OUT = 40; - - /** - * 我的声音列表 - */ - public static final int MY_VOICE = 41; /** * 声音匹配首页 */ @@ -149,10 +111,6 @@ public class RouterType { */ public static final int OPPOSITE_SEX_MATCHING = 43; - /** - * 嗨聊派对 - */ - public static final int CHAT_PARTY = 44; /** * 城市匹配 */ @@ -161,24 +119,11 @@ public class RouterType { * 游戏匹配 */ public static final int GAME_MATCHING = 46; - /** - * 话题 - */ - public static final int MINI_WORLD = 47; - - /** - * 首页-测一测 - */ - public static final int MINI_WORLD_TEST = 48; /** * 话题客态页 */ public static final int MINI_WORLD_DETAIL = 49; - /** - * ios分享使用，android未用到 - */ - public static final int IOS_USED_ONE = 50; /** * 发布动态 */ @@ -234,14 +179,6 @@ public class RouterType { * 67-我的公会 */ public static final int MODULE_CLAN = 67; - /** - * 68-青少年模式 - */ - public static final int PATRIARCH_MODE = 68; - /** - * 69-赛程管理 - */ - public static final int SCHEDULE_MANAGE = 69; /** * 70-访客记录 */ @@ -272,8 +209,6 @@ public class RouterType { */ public static final int MY_SET = 75; - public static final int TOPIC = 76; - /** * 收益记录（目前只是本地用到，所以用了100000） */ diff --git a/core/src/main/java/com/chwl/core/initial/InitialModel.java b/core/src/main/java/com/chwl/core/initial/InitialModel.java index 2c08cc371..9b5b4e7d3 100644 --- a/core/src/main/java/com/chwl/core/initial/InitialModel.java +++ b/core/src/main/java/com/chwl/core/initial/InitialModel.java @@ -40,7 +40,6 @@ import com.chwl.core.user.event.LoadLoginUserInfoEvent; import com.chwl.core.utils.CurrentTimeUtils; import com.chwl.core.utils.SharedPreferenceUtils; import com.chwl.core.utils.net.RxHelper; -import com.chwl.core.withdraw.WithdrawModel; import com.chwl.library.net.rxnet.RxNet; import com.chwl.library.utils.JavaUtil; import com.chwl.library.utils.ListUtils; @@ -261,12 +260,6 @@ public class InitialModel extends BaseModel implements IInitialModel { // 贵族配置json NobleDataManager.get().setOnlineConfigs(initInfo.getNobleResource()); } - - if (initInfo.getTax() != null) { - //提现 税率 - WithdrawModel.get().setTaxInfo(initInfo.getTax()); - } - // 兑换比率 if (initInfo.getExchangeGoldRate() != 0) { SharedPreferenceUtils.setExchangeGoldRate(initInfo.getExchangeGoldRate()); diff --git a/core/src/main/java/com/chwl/core/pay/IPayModel.java b/core/src/main/java/com/chwl/core/pay/IPayModel.java index 78dc6966c..dc8018733 100644 --- a/core/src/main/java/com/chwl/core/pay/IPayModel.java +++ b/core/src/main/java/com/chwl/core/pay/IPayModel.java @@ -28,8 +28,6 @@ public interface IPayModel extends IModel { void setCurrentWalletInfo(WalletInfo walletInfo); - void requestChargeOrOrderInfo(); - // 查询钱包的方法，需要加权限ticket Single getWalletInfo(long uid, String cache); @@ -45,13 +43,6 @@ public interface IPayModel extends IModel { Single getChargeList(int channelType, long uid); - //发起充值u - Single requestCharge(Context context, String chargeProdId, String payChannel); - - Single requestCDKeyCharge(String code); - - Single exchangeGold(int diamondNum, int hammerNum, String pwd); - /** * 修改支付密码时候，绑定手机时候获取手机验证码 * @@ -77,36 +68,9 @@ public interface IPayModel extends IModel { */ Single verifyCode(String phoneAreaCode, String mobile, String code); - /** - * 修改支付密码时候，绑定手机 - * - * @param uid - * @param phone - * @param code - * @param ticket - * @return - */ - Single> bindPhone(String uid, - String phone, - String code, - String ticket); - - Single getSmsBindAli(); - - /** - * 是否首次充值 - */ - Single isFirstCharge(); - - boolean isFirstChargeSuccess(); void setFirstChargeSuccess(boolean firstChargeSuccess); - Single giveGold(long toUid, String goldNum, String password); - - Single> getFirstChargeList(); - - Single getNewUserChargeInfo(); Single verifyOrder(String chargeRecordId, String googlePlayProdId, @@ -115,10 +79,6 @@ public interface IPayModel extends IModel { Single placeOrder(String googlePlayProdId); - Single> loadChargeBanner(); - Single getChargeContact(); - Single getChargeChannel(); - } diff --git a/core/src/main/java/com/chwl/core/pay/PayModel.java b/core/src/main/java/com/chwl/core/pay/PayModel.java index fa6d496ed..0160604f4 100644 --- a/core/src/main/java/com/chwl/core/pay/PayModel.java +++ b/core/src/main/java/com/chwl/core/pay/PayModel.java @@ -105,10 +105,6 @@ public class PayModel extends BaseModel implements IPayModel { } } - public void onRecieveGiftKnapMsg() { - - } - @Override public void setCurrentWalletInfo(WalletInfo walletInfo) { this.walletInfo = walletInfo; @@ -147,11 +143,6 @@ public class PayModel extends BaseModel implements IPayModel { } } - @Override - public void requestChargeOrOrderInfo() { - - } - //获取钱包信息 @Override public Single getWalletInfo(long uid, String cache) { @@ -196,64 +187,6 @@ public class PayModel extends BaseModel implements IPayModel { .compose(RxHelper.handleSchedulers()); } - - @Override - public Single requestCharge(Context context, String chargeProdId, String payChannel) { - return api.requestCharge( - String.valueOf(AuthModel.get().getCurrentUid()), - chargeProdId, - String.valueOf(payChannel), - NetworkUtils.getIPAddress(context), - AuthModel.get().getTicket() - ) - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()); - - } - - @Override - public Single requestCDKeyCharge(String code) { - - return api.requestCDKeyCharge( - String.valueOf(AuthModel.get().getCurrentUid()), - code, - AuthModel.get().getTicket() - ) - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()) - .flatMap(info -> { - walletInfo = info; - return Single.just(info.getAmount()); - }); - } - - /** - * 钻石兑换钻石 - * - * @param diamondNum 钻石数 - * @param hammerNum 得到的锤子数 - * @param pwd 支付密码 - * @return - */ - @Override - public Single exchangeGold(int diamondNum, int hammerNum, String pwd) { - return api.changeGold( - String.valueOf(AuthModel.get().getCurrentUid()), - String.valueOf(diamondNum), - String.valueOf(hammerNum), - pwd, - AuthModel.get().getTicket() - ) - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()) - .doOnSuccess(info -> { - walletInfo = info; - EventBus.getDefault().post(new UpdateWalletInfoEvent()); - }); - - } - - /** * 修改支付密码时候，绑定手机时候获取手机验证码 * @@ -299,75 +232,6 @@ public class PayModel extends BaseModel implements IPayModel { .compose(RxHelper.handleSchedulers()); } - - /** - * 修改支付密码时候，绑定手机 - * - * @param uid - * @param phone - * @param code - * @param ticket - * @return - */ - @Override - public Single> bindPhone(String uid, - String phone, - String code, - String ticket) { - return api.bindPhone(uid, DESUtils.DESAndBase64(phone), code, ticket).compose(RxHelper.handleSchedulers()); - } - - @Override - public Single getSmsBindAli() { - return api.getSmsBindAli(String.valueOf(AuthModel.get().getCurrentUid())) - .flatMap(new Function, SingleSource>() { - @Override - public SingleSource apply(ServiceResult stringServiceResult) throws Exception { - if (stringServiceResult.isSuccess()) { - return Single.just(ResUtil.getString(R.string.xchat_android_core_pay_paymodel_02)); - } else { - return Single.error(new Throwable(stringServiceResult.getMessage())); - } - } - }) - .compose(RxHelper.handleSchedulers()); - } - - - /** - * 减少本地缓存的钻石，同时设置WalletInfo到旧版的逻辑中 - * - * @param price - - */ - public void decreaseLocalGold(float price) { - if (walletInfo != null) { - double gold = walletInfo.getDiamondNum(); - if (walletInfo.getDiamondNum() > 0) { - walletInfo.setDiamondNum(gold - price); - } - // 兼容旧版扣钱 - compatOtherWalletInfo(walletInfo); - // 通知需要更新的地方 - IMNetEaseManager.get().getChatRoomEventObservable().onNext( - new RoomEvent().setEvent(RoomEvent.WALLET_UPDATE) - .setWalletInfo(walletInfo)); - } - } - - /** - * 如果本地没有钱包信息，加载网络的数据 - * - * @return 返回本地缓存的一个钱包信息 - */ - public Single getMyLocalWalletInfo() { - if (walletInfo != null) { - return Single.just(walletInfo); - } else { - return getMyRemoteWalletInfo(); - } - } - - public Single getMyRemoteWalletInfo() { long uid = AuthModel.get().getCurrentUid(); return getWalletInfo(uid, CACHE_STRATEGY_NO_CACHE) @@ -397,61 +261,17 @@ public class PayModel extends BaseModel implements IPayModel { setCurrentWalletInfo(walletInfo); } - /** - * 是否首次充值 - */ - @Override - public Single isFirstCharge() { - return api.apiIsFirstCharge() - .compose(RxHelper.handleCommon()); - } @Subscribe(threadMode = ThreadMode.MAIN) public void onFirstRechargeEvent(FirstRechargeEvent event) { setFirstChargeSuccess(true); } - @Override - public boolean isFirstChargeSuccess() { - return firstChargeSuccess; - } - @Override public void setFirstChargeSuccess(boolean firstChargeSuccess) { this.firstChargeSuccess = firstChargeSuccess; } - @Override - public Single giveGold(long toUid, String goldNum, String password) { - return api.giveGold(toUid, goldNum, password) - .compose(RxHelper.handleStringData()) - .compose(RxHelper.handleSchedulers()); - } - - /** - * 获取首充产品列表 - * - * @return - */ - @Override - public Single> getFirstChargeList() { - return api.getFirstChargeList() - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchAndExce()); - } - - /** - * 获取新用户限时首充产品列表 - * - * @return - */ - @Override - public Single getNewUserChargeInfo() { - return api.getNewUserChargeInfo() - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchAndExce()); - } - @Override public Single verifyOrder(String chargeRecordId, String googlePlayProdId, @@ -478,14 +298,6 @@ public class PayModel extends BaseModel implements IPayModel { .compose(RxHelper.handleSchedulers()); } - @Override - public Single> loadChargeBanner() { - return api.getChargeBanner() - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()) - .map(ChargeBannerInfo::getBanners); - } - @Override public Single getChargeContact() { return api.getChargeContact() @@ -493,14 +305,6 @@ public class PayModel extends BaseModel implements IPayModel { .compose(RxHelper.handleSchedulers()); } - @Override - public Single getChargeChannel() { - return api.getChargeChannel() - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()); - } - - public interface Api { /** @@ -536,48 +340,6 @@ public class PayModel extends BaseModel implements IPayModel { @Query("pub_uid") long pub_uid); - /** - * 发起充值 - * - * @param uid - * @param chargeProdId - * @param payChannel - * @param clientIp - * @return - */ - @POST("/charge/apply") - Single> requestCharge(@Query("uid") String uid, - @Query("chargeProdId") String chargeProdId, - @Query("payChannel") String payChannel, - @Query("clientIp") String clientIp, - @Query("ticket") String ticket); - - /** - * @param uid - * @param code - * @return - */ - @POST("/redeemcode/use") - Single requestCDKeyCharge(@Query("uid") String uid, - @Query("code") String code, - @Query("ticket") String ticket); - - - /** - * 钻石兑换 - * - * @param uid - * @param diamondNum - * @return - */ - @POST("/change/gold") - Single changeGold(@Query("uid") String uid, - @Query("diamondNum") String diamondNum, - @Query("keyNum") String keyNum, - @Query("paymentPwd") String paymentPwd, - @Query("ticket") String ticket); - - /** * 修改支付密码时候，绑定手机时候获取手机验证码 * @@ -607,69 +369,6 @@ public class PayModel extends BaseModel implements IPayModel { @Query("mobile") String mobile, @Query("code") String code); - /** - * 修改支付密码时候，绑定手机 - * - * @param uid - * @param phone - * @param code - * @param ticket - * @return - */ - @POST("withDraw/phone") - Single> bindPhone(@Query("uid") String uid, - @Query("phone") String phone, - @Query("code") String code, - @Query("ticket") String ticket); - - /** - * 哈哈获取绑定支付宝验证码 - * - * @param uid - * @return - */ - @POST("/withDraw/verification/code") - Single> getSmsBindAli(@Query("uid") String uid); - - /** - * 是否首次充值 - */ - @GET("/chargeRecord/isFirstCharge") - Single> apiIsFirstCharge(); - - /** - * 钻石转赠 - * - * @return - */ - @FormUrlEncoded - @POST("/user/diamond/give") - Single> giveGold(@Field("toUid") long toUid, - @Field("diamondNum") String diamondNum, - @Field("payPwd") String payPwd); - - /** - * 获取首充产品列表 - * - * @return - */ - @GET("/first/charge/list") - Single>> getFirstChargeList(); - - /** - * 获取新用户限时首充产品列表 - * - * @return - */ - @GET("/first/charge/limit/list") - Single> getNewUserChargeInfo(); - - @GET("/charge/guide/channel") - Single> getChargeChannel(); - - @GET("/charge/guide/banner") - Single> getChargeBanner(); - @GET("/charge/guide/contact") Single> getChargeContact(); diff --git a/core/src/main/java/com/chwl/core/withdraw/IWithdrawModel.java b/core/src/main/java/com/chwl/core/withdraw/IWithdrawModel.java deleted file mode 100644 index 5a2c6729c..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/IWithdrawModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.chwl.core.withdraw; - -import com.chwl.core.base.IModel; -import com.chwl.core.initial.bean.TaxInfo; -import com.chwl.core.withdraw.bean.ExchangerInfo; -import com.chwl.core.withdraw.bean.WithdrawInfo; -import com.chwl.core.withdraw.bean.WithdrwaListInfo; - -import java.util.List; - -import io.reactivex.Single; - -/** - * Created by Administrator on 2017/7/24. - */ - -public interface IWithdrawModel extends IModel{ - // 获取提现列表 - Single> getWithdrawList(); - - // 获取提现信息 - Single getWithdrawUserInfo(long uid); - - // 兑换接口,发起兑换 - Single requestExchange(long uid, int pid, String pwd, int accountType); - - //获取手机验证码 - Single getSmsCode(long uid, String ticket); - - //绑定支付宝 - Single binderAlipay(String aliPayAccount, String aliPayAccountName, String code); - - //获取提现税率 - public TaxInfo getTaxInfo(); - - //设置提现税率 - public void setTaxInfo(TaxInfo taxInfo); - - Single getBindBankCardTips(); - - Single bindBankCard(String bankCardNum, String bankCardName, String smsCode); -} diff --git a/core/src/main/java/com/chwl/core/withdraw/WithdrawModel.java b/core/src/main/java/com/chwl/core/withdraw/WithdrawModel.java deleted file mode 100644 index 617baa6a4..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/WithdrawModel.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.chwl.core.withdraw; - -import com.google.gson.JsonElement; -import com.chwl.core.R; -import com.chwl.core.auth.AuthModel; -import com.chwl.core.base.BaseModel; -import com.chwl.core.bean.response.ServiceResult; -import com.chwl.core.bean.response.result.ExchangeInfoResult; -import com.chwl.core.bean.response.result.WithdrawListResult; -import com.chwl.core.bean.response.result.WithdrawUserInfoResult; -import com.chwl.core.initial.bean.TaxInfo; -import com.chwl.core.user.UserModel; -import com.chwl.core.utils.APIEncryptUtil; -import com.chwl.core.utils.net.RxHelper; -import com.chwl.core.withdraw.bean.BindAliInfo; -import com.chwl.core.withdraw.bean.ExchangerInfo; -import com.chwl.core.withdraw.bean.RefreshInfo; -import com.chwl.core.withdraw.bean.WithdrawInfo; -import com.chwl.core.withdraw.bean.WithdrwaListInfo; -import com.chwl.core.withdraw.event.ExchangeInfoEvent; -import com.chwl.library.net.rxnet.RxNet; -import com.chwl.library.utils.ResUtil; -import com.chwl.library.utils.codec.DESUtils; - -import org.greenrobot.eventbus.EventBus; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.Query; - -/** - * Created by Administrator on 2017/7/24. - */ - -public class WithdrawModel extends BaseModel implements IWithdrawModel { - private final Api api = RxNet.create(Api.class); - private TaxInfo taxInfo; - - /** - * 提现时，金额过大，需要先实名认证 - */ - public static final int NOT_REAL_NAME_BEFORE_WITHDRAW = 10111; - - private static final class Helper { - public static final WithdrawModel INSTANCE = new WithdrawModel(); - } - - public static WithdrawModel get() { - return Helper.INSTANCE; - } - - - //获取提现列表 - @Override - public Single> getWithdrawList() { - return api.getWithdrawList() - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()); - - } - //获取提现页用户信息 - @Override - public Single getWithdrawUserInfo(long uid) { - return api.getWithdrawInfo( - String.valueOf(uid) - ) - .compose(RxHelper.handleBeanData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - - } - //发起兑换 - @Override - public Single requestExchange(long uid, int pid, String pwd, int accountType) { - return api.requestExchange( - String.valueOf(uid), - String.valueOf(pid), - pwd, - accountType, - AuthModel.get().getTicket() - ) - .flatMap(exchangeInfoResult -> { - if (exchangeInfoResult == null) { - return Single.error(new Throwable()); - } - if (exchangeInfoResult.isSuccess()) { - return Single.just(exchangeInfoResult.getData()); - } else { - return Single.error(new Throwable(exchangeInfoResult.getMessage())); - } - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .doOnSuccess(new Consumer() { - @Override - public void accept(ExchangerInfo exchangerInfo) throws Exception { - EventBus.getDefault().post(new ExchangeInfoEvent(exchangerInfo)); - } - }); - - } - //获取绑定支付宝验证码 - @Override - public Single getSmsCode(long uid, String ticket) { - Map paramsEncrypt = new HashMap<>(); - paramsEncrypt.put("ticket", ticket); - paramsEncrypt.put("uid", String.valueOf(uid)); - String paramsStr = null; - String signStr = null; - try { -// paramsStr = APIEncryptUtil.encryptParams(paramsEncrypt); - signStr = APIEncryptUtil.paramsToSign(paramsEncrypt); - } catch (Exception e) { - e.printStackTrace(); - } - return api.getSms( - paramsStr, - signStr - ) - .flatMap((Function>) serviceResult -> { - String msg = serviceResult == null ? "" : serviceResult.getMessage(); - if (serviceResult != null && serviceResult.isSuccess()) { - return Single.just(msg); - } - return Single.error(new Throwable(msg)); - }) - .compose(RxHelper.handleSchedulers()); - - } - //绑定支付宝 - @Override - public Single binderAlipay(String aliPayAccount, String aliPayAccountName, String code) { - return api.bindAlipay( - String.valueOf(AuthModel.get().getCurrentUid()), - DESUtils.DESAndBase64(aliPayAccount), - DESUtils.DESAndBase64(aliPayAccountName), - code, - AuthModel.get().getTicket() - ) - .flatMap((Function, SingleSource>) result -> { - if (result != null && result.isSuccess()) { - return Single.just(ResUtil.getString(R.string.xchat_android_core_withdraw_withdrawmodel_01)); - } - return Single.error(new Throwable(RxHelper.getValidMessage(result))); - }) - .doOnSuccess(new Consumer() { - @Override - public void accept(String s) throws Exception { - EventBus.getDefault().post(new RefreshInfo()); - } - }) - .compose(RxHelper.handleSchedulers()); - - } - - @Override - public TaxInfo getTaxInfo() { - return this.taxInfo; - } - - @Override - public void setTaxInfo(TaxInfo taxInfo) { - this.taxInfo = taxInfo; - } - - @Override - public Single getBindBankCardTips() { - return api.apiBindBankCardTips() - .compose(RxHelper.handleCommon(() -> "")); - } - - @Override - public Single bindBankCard(String bankCardNum, String bankCardName, String smsCode) { - return api.apiBindBankCard(bankCardNum, bankCardName, smsCode) - .compose(RxHelper.handleIgnoreData()) - .doOnSuccess(s -> { - EventBus.getDefault().post(new RefreshInfo()); - UserModel.get().updateCurrentUserInfo().subscribe(); - }); - } - - interface Api{ - /** - * 获取提现列表 - * @return - */ - @GET("/withDraw/findList") - Single getWithdrawList(); - - - /** - * 获取提现页用户信息 - * @param uid - * @return - */ - @GET("/withDraw/exchange") - Single getWithdrawInfo(@Query("uid") String uid); - - - - /** - * 发起兑换 提现接口 - * @param uid - - * @param pid - - * @param ticket - - * @param accountType 提现账号类型，1-提现到支付宝，3-提现到银行卡 - * @return - */ - @POST("/withDraw/v2/withDrawCash") - Single requestExchange(@Query("uid") String uid, - @Query("pid") String pid, - @Query("paymentPwd") String paymentPwd, - @Query("accountType") int accountType, - @Query("ticket") String ticket); - - - /** - * 获取绑定支付宝验证码 - * @param uid - * @param sign - * @return - */ - @POST("/withDraw/getSms") - Single getSms(@Query("params") String uid, - @Query("sign") String sign); - - - /** - * 绑定支付宝 - * @param uid - * @param aliPayAccount - * @param aliPayAccountName - * @param code - * @param ticket - * @return - */ - @POST("/withDraw/bound") - Single> bindAlipay(@Query("uid") String uid, - @Query("zxcAccount") String aliPayAccount, - @Query("zxcAccountName") String aliPayAccountName, - @Query("code") String code, - @Query("ticket") String ticket); - - /** - * 提现提示方案 - * @return - - */ - @GET("/withDraw/bankCard/tips") - Single> apiBindBankCardTips(); - - /** - * 绑定提现银行卡 - * @param bankCardNum 卡号 - * @param bankCardName 名字 - * @param smsCode 验证码 - * @return - - */ - @POST("/withDraw/bankCard/bind") - Single> apiBindBankCard(@Query("bankCardNum") String bankCardNum, - @Query("bankCardName") String bankCardName, - @Query("smsCode") String smsCode); - - } - - -} diff --git a/core/src/main/java/com/chwl/core/withdraw/bean/BindAliInfo.java b/core/src/main/java/com/chwl/core/withdraw/bean/BindAliInfo.java deleted file mode 100644 index 73bfdadb9..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/bean/BindAliInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.chwl.core.withdraw.bean; - -import lombok.Data; - -/** - * 绑定支付宝成功返回的对象 - * Created by lvzebiao on 2018/9/28. - */ -@Data -public class BindAliInfo { - /** - * {"uid":297,"hasRegPacket":false,"zxcAccount":"123","zxcAccountName":"007"} - */ - private long uid; - private boolean hasRegPacket; - private String zxcAccount; - private String zxcAccountName; -} diff --git a/core/src/main/java/com/chwl/core/withdraw/bean/RefreshInfo.java b/core/src/main/java/com/chwl/core/withdraw/bean/RefreshInfo.java deleted file mode 100644 index 5a899254b..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/bean/RefreshInfo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.chwl.core.withdraw.bean; - -/** - * Created by Administrator on 2017/7/26. - */ - -public class RefreshInfo { -} diff --git a/core/src/main/java/com/chwl/core/withdraw/event/ExchangeInfoEvent.java b/core/src/main/java/com/chwl/core/withdraw/event/ExchangeInfoEvent.java deleted file mode 100644 index f95d6d043..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/event/ExchangeInfoEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.chwl.core.withdraw.event; - -import com.chwl.core.base.BaseDataEvent; -import com.chwl.core.withdraw.bean.ExchangerInfo; - -/** - * Created by Administrator on 2018/9/17. - */ - -public class ExchangeInfoEvent extends BaseDataEvent { - public ExchangeInfoEvent(ExchangerInfo data) { - super(data); - } - - public ExchangeInfoEvent(String error) { - super(error); - } -} diff --git a/core/src/main/java/com/chwl/core/withdraw/event/WithdrawInfoEvent.java b/core/src/main/java/com/chwl/core/withdraw/event/WithdrawInfoEvent.java deleted file mode 100644 index 5811f8fd6..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/event/WithdrawInfoEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chwl.core.withdraw.event; - -import com.chwl.core.base.BaseDataEvent; -import com.chwl.core.withdraw.bean.WithdrawInfo; - -/** - * create by lvzebiao on 2018/9/8 - */ -public class WithdrawInfoEvent extends BaseDataEvent { - public WithdrawInfoEvent(WithdrawInfo data) { - super(data); - } - - public WithdrawInfoEvent(String error) { - super(error); - } -}