Fix bug - 提现失败记录
This commit is contained in:
parent
64a093782e
commit
4268521b7a
|
|
@ -2,6 +2,7 @@ package com.gamedog.vididin.beans
|
||||||
|
|
||||||
import com.ama.core.architecture.util.AndroidUtil
|
import com.ama.core.architecture.util.AndroidUtil
|
||||||
import com.ama.core.architecture.util.DateUtil
|
import com.ama.core.architecture.util.DateUtil
|
||||||
|
import com.gamedog.vididin.manager.WithdrawManager
|
||||||
import com.viddin.videos.free.R
|
import com.viddin.videos.free.R
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -20,7 +21,8 @@ abstract class BaseRecord {
|
||||||
|
|
||||||
open class RecordCash (var recordType: Int = 0,
|
open class RecordCash (var recordType: Int = 0,
|
||||||
var amountNum: Double = 0.0,
|
var amountNum: Double = 0.0,
|
||||||
var isSuccess: Boolean = false,) : BaseRecord()
|
var isSuccess: Boolean = false,
|
||||||
|
var withdrawFailType: Int = 0) : BaseRecord()
|
||||||
|
|
||||||
class RecordCashShow: RecordCash() {
|
class RecordCashShow: RecordCash() {
|
||||||
var title: Int = 0
|
var title: Int = 0
|
||||||
|
|
@ -62,7 +64,7 @@ fun RecordCash.toShowBean(): RecordCashShow {
|
||||||
|
|
||||||
RECORD_CASH_PLUS_WITHDRAW_FAIL -> {
|
RECORD_CASH_PLUS_WITHDRAW_FAIL -> {
|
||||||
title = R.string.record_cash_title_withdraw_failed
|
title = R.string.record_cash_title_withdraw_failed
|
||||||
description = R.string.record_cash_descr_withdraw_failed_3
|
description = WithdrawManager.instance().getFailHintStrRes(withdrawFailType)
|
||||||
iconRes = R.mipmap.icon_fail
|
iconRes = R.mipmap.icon_fail
|
||||||
textColor = R.color.gray3
|
textColor = R.color.gray3
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -310,8 +310,8 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity<ViewBinding>() {
|
||||||
WithdrawSuccessDialog(this@WithDrawActivity, cashNum).show()
|
WithdrawSuccessDialog(this@WithDrawActivity, cashNum).show()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showFailDialog(failType: Int) {
|
private fun showFailDialog(failHintRes: Int) {
|
||||||
WithdrawFailDialog(this@WithDrawActivity, failType).show()
|
WithdrawFailDialog(this@WithDrawActivity, failHintRes).show()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun gotoWithdrawSubActivity(selectedIndex: Int) {
|
private fun gotoWithdrawSubActivity(selectedIndex: Int) {
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,9 @@ import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.ama.core.architecture.util.ResUtil
|
import com.ama.core.architecture.util.ResUtil
|
||||||
import com.gamedog.vididin.VidiConst
|
import com.gamedog.vididin.VidiConst
|
||||||
import com.gamedog.vididin.beans.RECORD_CASH_PLUS_GOLD_CONVERT
|
import com.gamedog.vididin.beans.RECORD_CASH_PLUS_GOLD_CONVERT
|
||||||
|
import com.gamedog.vididin.beans.RECORD_CASH_PLUS_WITHDRAW_FAIL
|
||||||
import com.gamedog.vididin.beans.RecordCashShow
|
import com.gamedog.vididin.beans.RecordCashShow
|
||||||
|
import com.gamedog.vididin.manager.WithdrawManager
|
||||||
import com.viddin.videos.free.R
|
import com.viddin.videos.free.R
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import com.viddin.videos.free.databinding.FragmentWithdrawRecordCashItemBinding as ViewBinding
|
import com.viddin.videos.free.databinding.FragmentWithdrawRecordCashItemBinding as ViewBinding
|
||||||
|
|
@ -35,6 +37,8 @@ class RecordCashRvAdapter : ListAdapter<RecordCashShow, RecordCashRvAdapter.View
|
||||||
|
|
||||||
if (data.recordType == RECORD_CASH_PLUS_GOLD_CONVERT) {
|
if (data.recordType == RECORD_CASH_PLUS_GOLD_CONVERT) {
|
||||||
binding.tvDescription.text = String.format(ResUtil.getString(data.description), Math.abs(data.amountNum *10 * VidiConst.PER_01CASH_COST_GOLD_NUM).toInt())
|
binding.tvDescription.text = String.format(ResUtil.getString(data.description), Math.abs(data.amountNum *10 * VidiConst.PER_01CASH_COST_GOLD_NUM).toInt())
|
||||||
|
} else if (data.recordType == RECORD_CASH_PLUS_WITHDRAW_FAIL) {
|
||||||
|
binding.tvDescription.text = ResUtil.getString(data.description)
|
||||||
} else {
|
} else {
|
||||||
binding.tvDescription.text = ResUtil.getString(data.description)
|
binding.tvDescription.text = ResUtil.getString(data.description)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -470,7 +470,7 @@ class WithdrawManager private constructor() {
|
||||||
val recordBean = WithdrawManager.instance?.getRecord(recordNo)
|
val recordBean = WithdrawManager.instance?.getRecord(recordNo)
|
||||||
recordBean?.let {
|
recordBean?.let {
|
||||||
AccountManager.adjustCash(it.cashNum,
|
AccountManager.adjustCash(it.cashNum,
|
||||||
RecordCash(RECORD_CASH_PLUS_WITHDRAW_FAIL, it.cashNum.toDouble(), false).apply { uuid = recordNo })
|
RecordCash(RECORD_CASH_PLUS_WITHDRAW_FAIL, it.cashNum.toDouble(), false, failedType).apply { uuid = recordNo })
|
||||||
|
|
||||||
sendWithdrawResultStatistic(it.cashNum, false, failedType)
|
sendWithdrawResultStatistic(it.cashNum, false, failedType)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue