From 55b196ea2e28a8d859c85326f2147a4f7b7196de Mon Sep 17 00:00:00 2001 From: zuojincheng <lf_zuo@163.com> Date: 星期四, 10 四月 2025 10:58:32 +0800 Subject: [PATCH] feat(general): 新增开卡信息保存功能并优化界面布局- 新增 CardRegistrationBean 数据模型用于保存开卡信息 - 在数据库中添加 card_registration 表用于存储开卡记录 - 优化 NewCard2Activity 界面布局,调整样式和间距 - 添加协程支持,实现异步保存开卡信息到数据库 - 更新颜色配置,统一使用新加的 base_blue_bg 和 base_green_bg颜色 --- baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java index 102e8b8..e2381cb 100644 --- a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java +++ b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java @@ -1,6 +1,9 @@ package com.dayu.baselibrary.utils; +import android.text.TextUtils; + import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; /** @@ -16,6 +19,9 @@ * @return */ public static int changeY2F(String amount) { + if (TextUtils.isEmpty(amount)){ + return 0; + } BigDecimal bigDecimal = new BigDecimal(amount).setScale(2); return bigDecimal.multiply(new BigDecimal(100)).intValue(); } @@ -43,7 +49,8 @@ /** - * 绮剧‘闄ゆ硶锛屼繚鐣欎袱浣嶅皬鏁� + * 绮剧‘闄ゆ硶锛屼繚鐣欎袱浣嶅皬鏁� + * * @param dividend * @param divisor * @return @@ -55,4 +62,33 @@ return df.format(result); } + + /** + * 绯绘暟鍜屾按浠风浉涔樿幏寰楃數浠蜂繚鐣欎笁浣嶅皬鏁� + * @param num1 + * @param num2 + * @return + */ + public static String multiplyPrice(float num1, float num2) { + BigDecimal bd1 = BigDecimal.valueOf(num1); + BigDecimal bd2 = BigDecimal.valueOf(num2); + BigDecimal result = bd1.multiply(bd2); + return result.setScale(3, RoundingMode.HALF_UP).toString(); + } + + + /** + * + * @param num1 + * @param num2 + * @return + */ + public static String sumPrice(float num1, float num2) { + BigDecimal bd1 = BigDecimal.valueOf(num1); + BigDecimal bd2 = BigDecimal.valueOf(num2); + BigDecimal result = bd1.add(bd2); + return result.setScale(2, RoundingMode.HALF_UP).toString(); + } + + } -- Gitblit v1.8.0