From 6ee1c828f25f9ac5c11ac106c2eec211391ef48b Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Tue, 27 Feb 2024 14:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zj365/dc/activity/shop/CreateGoodsOrderAct.kt   |  3 ++-
 app/src/main/java/com/zj365/dc/weight/PrevDialog.kt | 10 ++++++----
 .../src/main/java/com/xty/common/util/NumUtils.kt   | 13 +++++++++++++
 .../java/com/xty/network/model/ComputeAmountBean.kt |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt b/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt
index 0870e43..b902ded 100644
--- a/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt
+++ b/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt
@@ -18,6 +18,7 @@ import com.xty.common.arouter.RouteManager
 import com.xty.common.event.ReChangeEvent
 import com.xty.common.event.WxPayEvent
 import com.xty.common.setImage
+import com.xty.common.util.NumUtils
 import com.zj365.dc.BuildConfig
 import com.zj365.dc.databinding.ActCreateGoodsOrderBinding
 import com.zj365.dc.vm.ShopMallVm
@@ -69,7 +70,7 @@ class CreateGoodsOrderAct : BaseVmAct<ShopMallVm>() {
         }
 
         mViewModel.computeAmountLiveData.observe(this){
-            binding.tvTotalPrice.text ="¥ ${it.data.pay_price}"
+            binding.tvTotalPrice.text ="¥ ${NumUtils.format3(it.data.pay_price)}"
             binding.tvPlatformDiscounts.text ="¥ ${it.data.discount_price}"
             couponBean?.let {
                 couponsId = it.id
diff --git a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt
index 0d33864..e22db50 100644
--- a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt
+++ b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt
@@ -71,8 +71,10 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
         span.setSpan(object : ClickableSpan() {
             override fun onClick(widget: View) {
                 val bundle = Bundle()
-                bundle.putString("title", "中健三六五健康 APP 权限列表")
-                bundle.putString("url", "https://dc.zhongjian365.com/permission.html")
+              /*  bundle.putString("title", "中健三六五健康 APP 权限列表")
+                bundle.putString("url", "https://dc.zhongjian365.com/permission.html")*/
+                bundle.putString("title", "用户协议")
+                bundle.putString("url","https://dc.zhongjian365.com/agreement.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
 
@@ -88,8 +90,8 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
             override fun onClick(widget: View) {
                 val bundle = Bundle()
                 bundle.clear()
-                bundle.putString("title", "用户协议")
-                bundle.putString("url","https://dc.zhongjian365.com/agreement.html")
+                bundle.putString("title", "隐私政策")
+                bundle.putString("url", "https://dc.zhongjian365.com/privacy.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
 
diff --git a/common/src/main/java/com/xty/common/util/NumUtils.kt b/common/src/main/java/com/xty/common/util/NumUtils.kt
index 01813f1..d55389a 100644
--- a/common/src/main/java/com/xty/common/util/NumUtils.kt
+++ b/common/src/main/java/com/xty/common/util/NumUtils.kt
@@ -19,4 +19,17 @@ object NumUtils {
         var mFormat = DecimalFormat(formatter)
         return mFormat.format(value).toString()
     }
+
+    fun format2(value:Double):String {
+        val df = DecimalFormat("#.00")
+        return  df.format(value)
+    }
+
+    fun format3(value:Double):Double {
+        val bg = BigDecimal(value)
+        return  bg.setScale(2,BigDecimal.ROUND_HALF_UP).toDouble()
+
+    }
+
+
 }
\ No newline at end of file
diff --git a/network/src/main/java/com/xty/network/model/ComputeAmountBean.kt b/network/src/main/java/com/xty/network/model/ComputeAmountBean.kt
index 36d5926..109465e 100644
--- a/network/src/main/java/com/xty/network/model/ComputeAmountBean.kt
+++ b/network/src/main/java/com/xty/network/model/ComputeAmountBean.kt
@@ -1,3 +1,3 @@
 package com.xty.network.model
 
-data class ComputeAmountBean(var pay_price:String,var discount_price:Float)
+data class ComputeAmountBean(var pay_price:Double,var discount_price:Double)