From dc0dba7b045c8ca17b2411ccc26fc00dff628a3f Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 11 Oct 2025 19:42:09 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=95=86=E5=93=81=E9=94=80=E5=94=AE=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E9=94=80=E5=94=AE=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/store/StoreIndexCusSaleTop10ResVO.java | 2 +- .../controller/xkt/vo/store/StoreIndexSaleTop10ResVO.java | 2 +- .../resources/mapper/quartz/DailySaleCustomerMapper.xml | 7 +++---- .../resources/mapper/quartz/DailySaleProductMapper.xml | 7 +++---- .../ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java | 2 +- .../com/ruoyi/xkt/dto/store/StoreIndexSaleTop10ResDTO.java | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java index c2cb0bd21..ba1d1d9d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexCusSaleTop10ResVO.java @@ -26,6 +26,6 @@ public class StoreIndexCusSaleTop10ResVO { @ApiModelProperty(value = "累计退货量") private Integer refundNum; @ApiModelProperty(value = "退货率") - private BigDecimal refundRate; + private String refundRate; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleTop10ResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleTop10ResVO.java index 6758c7f92..86c13c828 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleTop10ResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleTop10ResVO.java @@ -28,6 +28,6 @@ public class StoreIndexSaleTop10ResVO { @ApiModelProperty(value = "累计退货量") private Integer refundNum; @ApiModelProperty(value = "退货率") - private BigDecimal refundRate; + private String refundRate; } diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml index 8e6f3c6b5..0a3716126 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml @@ -30,10 +30,9 @@ SUM(IFNULL( dsc.sale_num, 0 )) AS saleNum, SUM(IFNULL( dsc.refund_num, 0 )) AS refundNum, CASE - WHEN SUM(IFNULL( dsc.sale_num, 0 )) = 0 THEN - 0 ELSE ROUND( - SUM(IFNULL( dsc.refund_num, 0 )) * 1.0 / SUM(IFNULL( dsc.sale_num, 0 )) * 100, 2) - END AS refundRate + WHEN SUM(IFNULL(dsc.sale_num, 0)) = 0 THEN '0%' + ELSE CONCAT( ROUND( ABS(SUM(IFNULL(dsc.refund_num, 0))) * 1.0 / SUM(IFNULL(dsc.sale_num, 0)) * 100, 2 ), '%' ) + END AS refundRate FROM daily_sale_customer dsc JOIN store_customer sc ON dsc.store_cus_id = sc.id diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml index ecdb4eca0..baa4669e5 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml @@ -60,10 +60,9 @@ SUM(IFNULL( dsp.sale_num, 0 )) AS saleNum, SUM(IFNULL( dsp.refund_num, 0 )) AS refundNum, CASE - WHEN SUM(IFNULL( dsp.sale_num, 0 )) = 0 THEN - 0 ELSE ROUND( - SUM(IFNULL( dsp.refund_num, 0 )) * 1.0 / SUM(IFNULL( dsp.sale_num, 0 )) * 100, 2) - END AS refundRate + WHEN SUM( IFNULL( dsp.sale_num, 0 )) = 0 THEN '0%' + ELSE CONCAT( ROUND( ABS( SUM( IFNULL( dsp.refund_num, 0 ))) * 1.0 / SUM( IFNULL( dsp.sale_num, 0 )) * 100, 2 ), '%') + END AS refundRate FROM daily_sale_product dsp LEFT JOIN store_product_file spf ON dsp.store_prod_id = spf.store_prod_id AND spf.file_type = 1 AND spf.order_num = 1 diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java index 4ed13982c..da237cade 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexCusSaleTop10ResDTO.java @@ -24,6 +24,6 @@ public class StoreIndexCusSaleTop10ResDTO { @ApiModelProperty(value = "累计退货量") private Integer refundNum; @ApiModelProperty(value = "退货率") - private BigDecimal refundRate; + private String refundRate; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleTop10ResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleTop10ResDTO.java index 47e01f0b1..e3aaf7f21 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleTop10ResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleTop10ResDTO.java @@ -28,6 +28,6 @@ public class StoreIndexSaleTop10ResDTO { @ApiModelProperty(value = "累计退货量") private Integer refundNum; @ApiModelProperty(value = "退货率") - private BigDecimal refundRate; + private String refundRate; }