diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java index 9f4b53882..3b6f5896d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java @@ -84,7 +84,7 @@ public class SysOrderController extends OrderBaseController { order.setPhone(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); } } - return getOrderDataTable(list, totalAmount.longValue()); + return getOrderDataTable(list, totalAmount); } diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/controller/OrderBaseController.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/controller/OrderBaseController.java index 42c58dced..cbbbc7db6 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/controller/OrderBaseController.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/controller/OrderBaseController.java @@ -5,11 +5,12 @@ import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.custom.page.OrderTableDataInfo; +import java.math.BigDecimal; import java.util.List; public class OrderBaseController extends BaseController { - protected OrderTableDataInfo getOrderDataTable(List list, long totalAmount) { + protected OrderTableDataInfo getOrderDataTable(List list, BigDecimal totalAmount) { OrderTableDataInfo rspData = new OrderTableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setMsg("查询成功"); diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/page/OrderTableDataInfo.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/page/OrderTableDataInfo.java index 230de4094..85bd9c91b 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/page/OrderTableDataInfo.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/page/OrderTableDataInfo.java @@ -2,6 +2,7 @@ package com.ruoyi.custom.page; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; public class OrderTableDataInfo implements Serializable { @@ -30,7 +31,7 @@ public class OrderTableDataInfo implements Serializable { /** * 金额总数 */ - private long totalAmount; + private BigDecimal totalAmount; /** * 表格数据对象 @@ -81,11 +82,11 @@ public class OrderTableDataInfo implements Serializable { this.msg = msg; } - public void setTotalAmount(long totalAmount) { + public void setTotalAmount(BigDecimal totalAmount) { this.totalAmount = totalAmount; } - public long getTotalAmount() { + public BigDecimal getTotalAmount() { return totalAmount; } } diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js index 113be2069..cd99d5d3c 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/ruoyi-ui/src/utils/ruoyi.js @@ -155,16 +155,10 @@ export function handleTree(data, id, parentId, children, rootId) { } /** 数字逢三位加逗号 */ -export function toThousands(num) { - var num = (num || 0).toString(), result = ''; - while (num.length > 3) { - result = ',' + num.slice(-3) + result; - num = num.slice(0, num.length - 3); - } - if (num) { - result = num + result; - } - return result; +export function toThousands(num){ + const str = num.toString(); + const reg = str.indexOf(".") > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g; + return str.replace(reg,"$1,"); } export function digitUppercase(n) { diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue index 72fab5dba..5976e23bd 100644 --- a/ruoyi-ui/src/views/custom/order/index.vue +++ b/ruoyi-ui/src/views/custom/order/index.vue @@ -198,15 +198,15 @@ - - - - - - - - - + + +