Просмотр исходного кода

fix: 每日充值弹窗总奖励取值问题

wutiaorong 10 месяцев назад
Родитель
Сommit
71590b37c5

+ 0 - 1
app/src/main/java/com/adealink/weparty/module/operation/data/ActivityTaskData.kt

@@ -97,7 +97,6 @@ data class ActivityTaskItem(
     @SerializedName("taskDimensionProgress") val taskDimensionProgress: Long, //完成单次任务的当前进度
     @SerializedName("taskDimensionTarget") val taskDimensionTarget: Long, //完成单次任务的数值目标, 为Null时表示没有任务目标 ,
     @SerializedName("visibleTaskProgress") val visibleTaskProgress: Int, //是否展示任务进度
-    @SerializedName("rewardNum") val rewardNum: Long,
 
     @SerializedName("rewardStatus") var rewardStatus: Int?, //奖励状态,见枚举值RewardStatusType定义
     @SerializedName("rewardPackage") val rewardPackage: Long, //每完成一次获得的奖励包裹

+ 6 - 1
module/operation/src/main/java/com/adealink/weparty/operation/rechargepackage/RechargeDailyFragment.kt

@@ -28,6 +28,7 @@ import com.adealink.weparty.commonui.widget.BottomDialogFragment
 import com.adealink.weparty.effect.AnimExtraConfig
 import com.adealink.weparty.module.operation.Operation
 import com.adealink.weparty.module.operation.adapter.RechargeDailyAdapter
+import com.adealink.weparty.module.operation.data.ProductTypeConstant
 import com.adealink.weparty.module.wallet.WalletModule
 import com.adealink.weparty.module.wallet.data.Currency
 import com.adealink.weparty.operation.R
@@ -158,7 +159,11 @@ class RechargeDailyFragment : BottomDialogFragment(R.layout.fragment_recharge_da
                 highestCoins += reward.taskDimensionTarget
                 if (reward.isTaskCompleted()) {
                     rechargeTotal = reward.taskDimensionProgress
-                    rewardTotal += reward.rewardNum
+                    reward.rewardInfo.forEach { subReward ->
+                        if (subReward.rewardResourceType == ProductTypeConstant.Coin.type) {
+                            rewardTotal += subReward.rewardNum.toLong()
+                        }
+                    }
                 }
                 if (nextReceivedIndex == -1 && !reward.isTaskCompleted()) {
                     nextReceivedIndex = index