diff --git a/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt
index 66a33d98b..af92b764b 100644
--- a/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt
+++ b/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt
@@ -43,10 +43,8 @@ class ConvertDiamondActivity : BaseViewBindingActivity<ActivityConvertDiamondBin
         initTitleBar(getString(R.string.convert_diamond))
         val bean = intent.getSerializableExtra(BEAN) as? GoldToDiamondInfo
         bean?.let {
-            binding.tvMyGold.text = getString(R.string.my_gold, it.golds.toString())
-            binding.tvMyDiamond.text = getString(R.string.my_diamond, it.diamonds.toString())
-            binding.edGold.hint = it.minGolds.toString()
-            binding.edDiamond.hint = it.minDiamonds.toString()
+            binding.tvMyGold.text = getString(R.string.my_gold, it.golds?.toPlainString())
+            binding.tvMyDiamond.text = getString(R.string.my_diamond, it.diamonds?.toPlainString())
             binding.edGold.setOnFocusChangeListener { view, b ->
                 isGold = b
             }
diff --git a/app/src/main/java/com/chwl/app/ui/wallet/WalletDiamondFragment.kt b/app/src/main/java/com/chwl/app/ui/wallet/WalletDiamondFragment.kt
index bddb2aa7a..7328c4c7a 100644
--- a/app/src/main/java/com/chwl/app/ui/wallet/WalletDiamondFragment.kt
+++ b/app/src/main/java/com/chwl/app/ui/wallet/WalletDiamondFragment.kt
@@ -58,6 +58,6 @@ class WalletDiamondFragment : BaseBindingFragment<WalletDiamondFragmentBinding>(
     }
 
     private fun updateValue(number: Double) {
-        mBinding.tvCurrencyValue.text = FormatUtils.formatBigInteger(number)
+        mBinding.tvCurrencyValue.text = FormatUtils.formatBigDecimal(number)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
index d2ccfabbe..06a070d73 100644
--- a/core/src/main/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
+++ b/core/src/main/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
@@ -6,8 +6,8 @@ import java.math.BigDecimal
 
 @Data
 data class GoldToDiamondInfo(
-    val diamonds: BigDecimal,
-    val golds: BigDecimal,
+    val diamonds: BigDecimal?,
+    val golds: BigDecimal?,
     val rate: Double,
     val maxDiamonds: Long,
     val minDiamonds: Long,
diff --git a/library/src/main/java/com/chwl/library/utils/FormatUtils.java b/library/src/main/java/com/chwl/library/utils/FormatUtils.java
index 6a5338bec..42f42a382 100644
--- a/library/src/main/java/com/chwl/library/utils/FormatUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/FormatUtils.java
@@ -18,7 +18,7 @@ public class FormatUtils {
 
     public static String formatBigDecimal(double bigDecimal) {
         try {
-            DecimalFormat decimalFormat = new DecimalFormat("#,##0.00");
+            DecimalFormat decimalFormat = new DecimalFormat("#,##0.##");
             decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
             decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH));
             return decimalFormat.format(bigDecimal);