feat : 刪除 提現相關內容

This commit is contained in:
eggmanQQQ
2024-10-25 13:44:21 +08:00
parent 6fde178c79
commit 6916a96e4e
65 changed files with 43 additions and 2789 deletions

View File

@@ -183,7 +183,7 @@ public class ServiceResult<T> implements Serializable {
errorStr = ResUtil.getString(R.string.bean_response_serviceresult_025);
break;
case WEEKNOTWITHCASHTOWNUMS:
errorStr = ResUtil.getString(R.string.bean_response_serviceresult_026);
errorStr = ResUtil.getString(R.string.network_abnormality_check_again);
break;
default:
errorStr = message;

View File

@@ -1,7 +1,6 @@
package com.chwl.core.bean.response.result;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.withdraw.bean.ExchangerInfo;
/**
* Created by Administrator on 2017/7/5 0005.

View File

@@ -1,4 +1,4 @@
package com.chwl.core.withdraw.bean;
package com.chwl.core.bean.response.result;
/**
* Created by Administrator on 2017/7/27.

View File

@@ -1,13 +0,0 @@
package com.chwl.core.bean.response.result;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.withdraw.bean.WithdrwaListInfo;
import java.util.List;
/**
* Created by Administrator on 2017/7/5 0005.
*/
public class WithdrawListResult extends ServiceResult<List<WithdrwaListInfo>> {
}

View File

@@ -1,14 +0,0 @@
package com.chwl.core.bean.response.result;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.redPacket.bean.WithdrawRedListInfo;
import java.util.List;
/**
* Created by zhouxiangfeng on 2017/5/28.
*/
public class WithdrawRedListResult extends ServiceResult<List<WithdrawRedListInfo>> {
}

View File

@@ -1,12 +0,0 @@
package com.chwl.core.bean.response.result;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo;
/**
* Created by zhouxiangfeng on 2017/5/28.
*/
public class WithdrawRedSucceedResult extends ServiceResult<WithdrawRedSucceedInfo> {
}

View File

@@ -1,12 +0,0 @@
package com.chwl.core.bean.response.result;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.withdraw.bean.WithdrawInfo;
/**
* Created by zhouxiangfeng on 2017/5/4.
*/
public class WithdrawUserInfoResult extends ServiceResult<WithdrawInfo> {
}

View File

@@ -88,33 +88,8 @@ public class BillModel extends BaseModel implements IBillModel {
.observeOn(AndroidSchedulers.mainThread());
}
@Override
public Single<IncomedResult> getWithdrawBills(int pageNo, int pageSize, long time) {
return api.getBillRecord(
String.valueOf(AuthModel.get().getCurrentUid()),
String.valueOf(pageNo),
String.valueOf(pageSize),
String.valueOf(time),
String.valueOf(BillType.WITHDRAW_RECORDS))
.flatMap((Function<ServiceResult<JsonElement>, Single<IncomedResult>>) jsonElementServiceResult -> {
String json = new Gson().toJson(jsonElementServiceResult);
IncomedResult incomedResult = new Gson().fromJson(json, IncomedResult.class);
return Single.just(incomedResult);
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@Override
public Single<RedBagResult> getWithdrawRedBills(int pageNo, int pageSize, long time) {
return api.getWithdrawRedBills(
String.valueOf(AuthModel.get().getCurrentUid()),
String.valueOf(pageNo),
String.valueOf(pageSize),
String.valueOf(time))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@Override
public Single<IncomedResult> getChatBills(int pageNo, int pageSize, long time) {
@@ -193,20 +168,7 @@ public class BillModel extends BaseModel implements IBillModel {
@Query("date") String date,
@Query("type") String type);
/**
* 账单提现查询(红包提现)
*
* @param uid
* @param pageNo
* @param pageSize
* @param date
* @return
*/
@GET("/packetrecord/deposit")
Single<RedBagResult> getWithdrawRedBills(@Query("uid") String uid,
@Query("pageNo") String pageNo,
@Query("pageSize") String pageSize,
@Query("date") String date);
/**

View File

@@ -27,18 +27,7 @@ public interface IBillModel extends IModel {
*/
Single<ExpendResult> getGiftExpendBills(int pageNo, int pageSize, long time);
/**
* 提现记录
* @param pageNo
* @param pageSize
* @param time
*/
Single<IncomedResult> getWithdrawBills(int pageNo, int pageSize, long time);
/**
* 获取账单红包
*/
Single<RedBagResult> getWithdrawRedBills(int pageNo, int pageSize, long time);
/**
*

View File

@@ -22,8 +22,6 @@ public class BillItemEntity implements MultiItemEntity {
public IncomeInfo mGiftInComeInfo;
/** 密聊实体 */
public IncomeInfo mChatInComeInfo;
/** 提现记录 */
public IncomeInfo mWithdrawInfo;
/** 充值记录信息 */
public ExpendInfo mChargeExpendInfo;
/** 礼物支出 */

View File

@@ -25,5 +25,5 @@ public class BillType {
/**
* 提现记录
*/
public static final int WITHDRAW_RECORDS = 5;
public static final int DRAW_RECORDS = 5;
}

View File

@@ -1,16 +0,0 @@
package com.chwl.core.earn.bean
import lombok.Data
import java.io.Serializable
import java.math.BigDecimal
@Data
data class ConfigWithdrawInfo(
val account: WithdrawAccount? = null,
val golds: BigDecimal,//钱包当前金币数
val remainTimes: Int,//周剩余次数
val fee: Double,//手续费
val minGolds: Long,
val maxGolds: Long,
val hasPayPwd: Boolean
) : Serializable

View File

@@ -1,17 +0,0 @@
package com.chwl.core.earn.bean
import lombok.Data
import java.io.Serializable
@Data
data class WithdrawAccount(
val uid: Long,
val swift: String,
val bankName: String,
val accountNumber: String,
val accountName: String,
val address: String,
val city: String,
val province: String,
val postCode: String
) : Serializable

View File

@@ -38,40 +38,11 @@ object EarnModel : BaseModel() {
api.exchangeConfirm(goldNum, diamondNum, currency)
}
suspend fun getConfigWithdrawInfo(): ConfigWithdrawInfo? =
launchRequest {
api.getConfigWithdrawInfo()
}
suspend fun exchange(goldNum: Double, payPwd: String): Any? =
launchRequest {
api.exchange(goldNum, payPwd)
}
suspend fun bound(
uid: Long,
swift: String,
bankName: String,
accountNumber: String,
accountName: String,
address: String,
city: String,
province: String,
postCode: String
): String? =
launchRequest {
api.bound(
uid,
swift,
bankName,
accountNumber,
accountName,
address,
city,
province,
postCode
)
}
suspend fun getMemberSettlement(startTime: String, endTime: String): ClanHallMemberIncomeTotalInfo? =
launchRequest {
@@ -113,36 +84,9 @@ object EarnModel : BaseModel() {
@Query("currency") currency: Int
): ServiceResult<String>
/**
* @return
*/
@GET("/withdraw/getConfig")
suspend fun getConfigWithdrawInfo(): ServiceResult<ConfigWithdrawInfo>
/**
* @return
*/
@POST("/withdraw/exchange")
suspend fun exchange(
@Query("goldNum") goldNum: Double,
@Query("payPwd") payPwd: String
): ServiceResult<Any>
/**
* @return
*/
@POST("/withdraw/bound")
suspend fun bound(
@Query("uid") uid: Long,
@Query("swift") swift: String,
@Query("bankName") bankName: String,
@Query("accountNumber") accountNumber: String,
@Query("accountName") accountName: String,
@Query("address") address: String,
@Query("city") city: String,
@Query("province") province: String,
@Query("postCode") postCode: String
): ServiceResult<String>
/**
* @return

View File

@@ -26,7 +26,7 @@ public class NotifyEvent {
}
public @interface Action{
int ACT_BAI_SHUN_GAME = 1; //准备送礼
int ACT_BAI_SHUN_GAME = 1; // 遊戲橫幅被點擊
}
}

View File

@@ -118,13 +118,6 @@ public class ParamsInterceptor implements Interceptor {
// paramsMap.putAll(mHttpParams);
paramsMap.remove("ticket");//服务器要求移除ticket,后签名
// if (!(oldRequest.url().encodedPath().contains("/acc/sms")
// || oldRequest.url().encodedPath().contains("/withDraw/phoneCode")
// || oldRequest.url().encodedPath().contains("/withDraw/getSms"))) {
// for (Map.Entry<String, String> entry : paramsMap.entrySet()) {//还原 urlEncode 参数
// entry.setValue(URLDecoder.decode(entry.getValue(), "UTF-8"));
// }
// }
String signStr = "";
try {
// Log.e("ParamsInterceptor", " url: " + oldRequest.url()+ " encrypt params Map : " + paramsMap.toString());

View File

@@ -1,29 +0,0 @@
package com.chwl.core.redPacket;
import com.chwl.core.base.IModel;
import com.chwl.core.redPacket.bean.ActionDialogInfo;
import com.chwl.core.redPacket.bean.RedDrawListInfo;
import com.chwl.core.redPacket.bean.RedPacketInfo;
import com.chwl.core.redPacket.bean.WithdrawRedListInfo;
import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo;
import java.util.List;
import io.reactivex.Single;
/**
* Created by ${Seven} on 2017/9/20.
*/
public interface IRedPacketModel extends IModel {
//获取红包页面信息
Single<RedPacketInfo> getRedPacketInfo();
//进入主界面有红包后设置弹窗类型 1首页 2直播间
Single<List<ActionDialogInfo>> getActionDialog(int type);
//获取红包提现列表
Single<List<WithdrawRedListInfo>> getRedList();
//发起红包提现
Single<WithdrawRedSucceedInfo> getRedWithdraw(long uid, int packetId, String pwd);
//获取红包提现列表
Single<List<RedDrawListInfo>> getRedDrawList();
}

View File

@@ -1,187 +0,0 @@
package com.chwl.core.redPacket;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.base.BaseModel;
import com.chwl.core.bean.response.result.ActionDialogResult;
import com.chwl.core.bean.response.result.RedDrawListInfoResult;
import com.chwl.core.bean.response.result.RedPacketResult;
import com.chwl.core.bean.response.result.WithdrawRedListResult;
import com.chwl.core.bean.response.result.WithdrawRedSucceedResult;
import com.chwl.core.redPacket.bean.ActionDialogInfo;
import com.chwl.core.redPacket.bean.RedDrawListInfo;
import com.chwl.core.redPacket.bean.RedPacketInfo;
import com.chwl.core.redPacket.bean.WithdrawRedListInfo;
import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo;
import com.chwl.core.redPacket.event.GetRedInfoEvent;
import com.chwl.core.utils.net.RxHelper;
import com.chwl.library.net.rxnet.RxNet;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Query;
/**
* Created by ${Seven} on 2017/9/20.
*/
public class RedPacketModel extends BaseModel implements IRedPacketModel {
private final Api api = RxNet.create(Api.class);
private static final class Helper {
public static final RedPacketModel INSTANCE = new RedPacketModel();
}
public static RedPacketModel get() {
return RedPacketModel.Helper.INSTANCE;
}
private RedPacketModel() {
}
//获取红包页面数据
@Override
public Single<RedPacketInfo> getRedPacketInfo() {
return api.getRedPacket(
String.valueOf(AuthModel.get().getCurrentUid())
)
.compose(RxHelper.handleBeanData())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doOnSuccess(new Consumer<RedPacketInfo>() {
@Override
public void accept(RedPacketInfo redPacketInfo) throws Exception {
EventBus.getDefault().post(new GetRedInfoEvent(redPacketInfo));
// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient
// .METHOD_ON_GET_RED_INFO, response.getData());
}
})
.doOnError(new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient
// .METHOD_ON_GET_RED_INFO_ERROR, error.getErrorStr());
EventBus.getDefault().post(new GetRedInfoEvent(throwable.getMessage()));
}
});
}
@Override
public Single<List<ActionDialogInfo>> getActionDialog(int type) {
return api.getRedBagDialogType(
String.valueOf(type)
)
.compose(RxHelper.handleBeanData())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
// .subscribe(new OldHttpObserver<ActionDialogResult>() {
// @Override
// public void onFail(RequestError error) {
// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient
// .METHOD_ON_GET_ACTION_DIALOG_ERROR, error.getErrorStr());
// }
//
// @Override
// public void onSuccess(ActionDialogResult response) {
// if (null != response) {
// if (response.isSuccess()) {
// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient
// .METHOD_ON_GET_ACTION_DIALOG, response.getData());
// } else {
// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient
// .METHOD_ON_GET_ACTION_DIALOG_ERROR, response.getMessage());
// }
// }
// }
// });
}
@Override
public Single<List<WithdrawRedListInfo>> getRedList() {
return api.getRedBagList()
.compose(RxHelper.handleBeanData())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@Override
public Single<WithdrawRedSucceedInfo> getRedWithdraw(long uid, int packetId, String pwd) {
return api.getRedWithdraw(
String.valueOf(uid),
String.valueOf(packetId),
pwd,
AuthModel.get().getTicket()
)
.compose(RxHelper.handleBeanData())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@Override
public Single<List<RedDrawListInfo>> getRedDrawList() {
return api.getRedDrawList()
.compose(RxHelper.handleBeanData())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
interface Api{
/**
*
* @param uid
* @return
*/
@GET("/statpacket/get")
Single<RedPacketResult> getRedPacket(@Query("uid") String uid);
/**
* 获取红包弹窗活动类型
* @param type
* @return
*/
@GET("/activity/query")
Single<ActionDialogResult> getRedBagDialogType(@Query("type") String type);
/**
* 获取红包提现列表
* @return
*/
@GET("/redpacket/list")
Single<WithdrawRedListResult> getRedBagList();
/**
* 发起红包提现
* @param uid
* @param packetId
* @param ticket
* @return
*/
@POST("/redpacket/withdraw")
Single<WithdrawRedSucceedResult> getRedWithdraw(@Query("uid") String uid,
@Query("packetId") String packetId,
@Query("paymentPwd") String paymentPwd,
@Query("ticket") String ticket);
/**
* 红包提现列表
* @return
*/
@GET("/redpacket/drawlist")
Single<RedDrawListInfoResult> getRedDrawList();
}
}

View File

@@ -1,53 +0,0 @@
package com.chwl.core.redPacket.bean;
import java.io.Serializable;
/**
* Created by ${Seven} on 2017/9/27.
*/
public class WithdrawRedListInfo implements Serializable {
/* "packetNum":100,
"prodStauts":1,
"seqNo":1
*/
private int packetNum;
private int prodStauts;
private int seqNo;
public boolean isSelected;
public int getPacketId() {
return packetId;
}
public void setPacketId(int packetId) {
this.packetId = packetId;
}
private int packetId;
public int getPacketNum() {
return packetNum;
}
public void setPacketNum(int packetNum) {
this.packetNum = packetNum;
}
public int getProdStauts() {
return prodStauts;
}
public void setProdStauts(int prodStauts) {
this.prodStauts = prodStauts;
}
public int getSeqNo() {
return seqNo;
}
public void setSeqNo(int seqNo) {
this.seqNo = seqNo;
}
}

View File

@@ -1,28 +0,0 @@
package com.chwl.core.redPacket.bean;
import java.io.Serializable;
/**
* Created by ${Seven} on 2017/9/27.
*/
public class WithdrawRedSucceedInfo implements Serializable {
private long uid;
private double packetNum;
public long getUid() {
return uid;
}
public void setUid(long uid) {
this.uid = uid;
}
public double getPacketNum() {
return packetNum;
}
public void setPacketNum(int packetNum) {
this.packetNum = packetNum;
}
}

View File

@@ -1,57 +0,0 @@
package com.chwl.core.withdraw.bean;
import java.io.Serializable;
import lombok.Data;
/**
* Created by Administrator on 2017/7/25.
*/
@Data
public class WithdrawInfo implements Serializable{
/**
* 提现到阿里
*/
public final static int ACCOUNT_TYPE_ALIPAY = 1;
/**
* 提现到银行卡
*/
public final static int ACCOUNT_TYPE_BANK_CARD = 3;
/*
uid:90000
zxcAccount:xxx //支付宝账号
zxcAccountName:xxx //支付宝姓名
diamondNum:钻石余额
isNotBoundPhone:true//没有绑定手机,绑定了手机不返回该字段
*/
public long uid;
public String zxcAccount;
public double diamondNum;
public String zxcAccountName;
public Boolean isNotBoundPhone;
private boolean isBindAlipay;
private boolean isBindBankCard;
private String bankCardNum;
private String bankCardName;
private int bankCardMinAmount;
/**
* 默认提现账号类型1-支付宝3-银行卡
*/
private int defaultWithdrawAccountType;
/**
* 是否展示账号类型切换按钮
*/
private boolean switchButtonShow;
/**
* 提现费率
*/
private double withdrawRate;
}

View File

@@ -1,36 +0,0 @@
package com.chwl.core.withdraw.bean;
import java.io.Serializable;
import lombok.Data;
/**
* 钻石实体
* Created by Administrator on 2017/7/24.
*/
@Data
public class WithdrwaListInfo implements Serializable{
/*
cashProdId1 //id
cashProdName: 10000钻=¥100 //列表名称
diamondNum:10000 //钻石数量
cashNum:100 //对应金额
seqNo:1 //排序
*/
public int cashProdId;
public String cashProdName;
public double diamondNum;
public int cashNum;
public boolean isSelected;
/**
* 实际到账
*/
private double actualArrival;
/**
* 提现手续费
*/
private double withdrawalFee;
}

View File

@@ -252,7 +252,6 @@
<string name="bean_response_serviceresult_023">الطلب غير موجود</string>
<string name="bean_response_serviceresult_024">خطأ في إرسال الرسالة النصية</string>
<string name="bean_response_serviceresult_025">صيغة رقم الهاتف غير صحيحة</string>
<string name="bean_response_serviceresult_026">يمكن سحبه فقط مرتين في الأسبوع</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_01">الحب مُزعج جداً، سأُزعجك في المستقبل</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_02">أتيت من أجلك، بغض النظر عن تجاوز الجبال</string>
@@ -583,7 +582,6 @@
<string name="xchat_android_core_utils_stringutils_013">السبت</string>
<string name="xchat_android_core_utils_stringutils_014">الأحد</string>
<string name="web_bean_webjsbeaninfo_01">الأسئلة المتكررة</string>
<string name="xchat_android_core_withdraw_withdrawmodel_01">تم ربطه بنجاح</string>
<string name="bank_card_bean_bankcardlistresp_01">بنك الصين الأوسط</string>
<string name="bank_card_bean_bankcardlistresp_02">بطاقة التوفير</string>
<string name="community_download_downloadmodel_01">فشل التنزيل</string>

View File

@@ -246,7 +246,6 @@
<string name="bean_response_serviceresult_023">訂單不存在</string>
<string name="bean_response_serviceresult_024">發送短信出錯</string>
<string name="bean_response_serviceresult_025">手機格式不正確</string>
<string name="bean_response_serviceresult_026">每周只能提現2次</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_01">談戀愛太麻煩了,以後就麻煩你了</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_02">我是為你而來,不在乎穿越綿綿山脈</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_03">我想你了,是那種要見一面緊緊抱住的那種</string>
@@ -451,12 +450,6 @@
<string name="pk_model_pkmodel_026">成功</string>
<string name="pk_model_pkmodel_027">PK還沒準備好</string>
<string name="pk_model_pkmodel_028">沒有創建PK</string>
<string name="queue_bean_consumeinfo_01">呆萌小熊貓</string>
<string name="queue_bean_consumeinfo_02">周冬雨的凝視</string>
<string name="queue_bean_consumeinfo_03">豆子一號</string>
<string name="queue_bean_consumeinfo_04">納尼</string>
<string name="queue_bean_consumeinfo_05">清涼小西瓜</string>
<string name="queue_bean_consumeinfo_06">🐬□詩涵</string>
<string name="xchat_android_core_settings_settingsmodel_01">設置不提醒用戶出錯code=</string>
<string name="xchat_android_core_share_sharemodel_01">分享成功</string>
<string name="xchat_android_core_share_sharemodel_02">分享失敗,請重試</string>
@@ -573,7 +566,6 @@
<string name="xchat_android_core_utils_stringutils_013">周六</string>
<string name="xchat_android_core_utils_stringutils_014">周日</string>
<string name="web_bean_webjsbeaninfo_01">常見問題</string>
<string name="xchat_android_core_withdraw_withdrawmodel_01">綁定成功</string>
<string name="bank_card_bean_bankcardlistresp_01">中國光大銀行</string>
<string name="bank_card_bean_bankcardlistresp_02">儲蓄卡</string>
<string name="community_download_downloadmodel_01">下載失敗</string>

View File

@@ -246,7 +246,6 @@
<string name="bean_response_serviceresult_023">Order does not exist</string>
<string name="bean_response_serviceresult_024">Error sending SMS</string>
<string name="bean_response_serviceresult_025">Incorrect phone number format</string>
<string name="bean_response_serviceresult_026">Can only withdraw twice a week</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_01">Love is too troublesome, I&#038;ll trouble you in the future</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_02">I came for you, regardless of crossing the mountains</string>
<string name="xchat_android_core_bean_roomnewbiemessageinfo_03">I miss you, the kind that wants to meet and hug tightly</string>
@@ -567,7 +566,6 @@
<string name="xchat_android_core_utils_stringutils_013">Saturday</string>
<string name="xchat_android_core_utils_stringutils_014">Sunday</string>
<string name="web_bean_webjsbeaninfo_01">Frequently Asked Questions</string>
<string name="xchat_android_core_withdraw_withdrawmodel_01">Binding successful</string>
<string name="bank_card_bean_bankcardlistresp_01">China Everbright Bank</string>
<string name="bank_card_bean_bankcardlistresp_02">Savings card</string>
<string name="community_download_downloadmodel_01">Download failed</string>

View File

@@ -17,7 +17,6 @@ public interface CodeType {
int RESET_PAY_PSW = 6;
int UNBIND_PHONE = 7;
int SUPER_ADMIN = 10;
int BIND_WITHDRAW_BANK_CARD = 11;
int RESET_PSW_NOT_LOGIN = 13;
int RESET_PSW_LOGIN = 14;
}