From f4f6ae0c036abb09dd7afbd463340adc81c8f22d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 06 二月 2024 21:51:33 +0800
Subject: [PATCH] 优化报表进度问题

---
 service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java
index 5b02ed1..bf09636 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryFeeDataReportCmd.java
@@ -11,6 +11,7 @@
 import com.java110.report.statistics.IOrderStatistics;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.MoneyUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -59,69 +60,69 @@
         double receivedFee = feeStatisticsImpl.getReceivedFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","瀹炴敹閲戦");
-        data.put("value", receivedFee);
+        data.put("value", MoneyUtil.computePriceScale(receivedFee));
         datas.add(data);
 
         // todo 鏌ヨ 娆犺垂閲戦
         double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","娆犺垂閲戦");
-        data.put("value", oweFee);
+        data.put("value", MoneyUtil.computePriceScale(oweFee));
         datas.add(data);
 
         // todo 鏌ヨ 浼樻儬閲戦
         double discountFee = feeStatisticsImpl.getDiscountFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","浼樻儬閲戦");
-        data.put("value", discountFee);
+        data.put("value", MoneyUtil.computePriceScale(discountFee));
         datas.add(data);
 
         // todo 鏌ヨ 婊炵撼閲�
         double lateFee = feeStatisticsImpl.getLateFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","婊炵撼閲�");
-        data.put("value", lateFee);
+        data.put("value", MoneyUtil.computePriceScale(lateFee));
         datas.add(data);
 
         // todo 鏌ヨ 璐︽埛棰勫瓨
         double prestoreAccount = feeStatisticsImpl.getPrestoreAccount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","璐︽埛棰勫瓨");
-        data.put("value", prestoreAccount);
+        data.put("value", MoneyUtil.computePriceScale(prestoreAccount));
         datas.add(data);
 
         // todo 鏌ヨ 璐︽埛鎵ｆ
         double withholdAccount = feeStatisticsImpl.getWithholdAccount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","璐︽埛鎵ｆ");
-        data.put("value", withholdAccount);
+        data.put("value", MoneyUtil.computePriceScale(withholdAccount));
         datas.add(data);
 
         // todo 鏌ヨ 涓存椂杞︽敹鍏�
         double tempCarFee = feeStatisticsImpl.getTempCarFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","涓存椂杞︽敹鍏�");
-        data.put("value", tempCarFee);
+        data.put("value", MoneyUtil.computePriceScale(tempCarFee));
         datas.add(data);
 
         // todo 鏌ヨ 鎶奸噾閫�娆�
         double refundDeposit = feeStatisticsImpl.geRefundDeposit(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","鎶奸噾閫�娆�");
-        data.put("value", refundDeposit);
+        data.put("value", MoneyUtil.computePriceScale(refundDeposit));
         datas.add(data);
 
         // todo 鏌ヨ 閫�娆捐鍗曟暟
         double refundOrderCount = feeStatisticsImpl.geRefundOrderCount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","閫�娆捐鍗曟暟");
-        data.put("value", refundOrderCount);
+        data.put("value", MoneyUtil.computePriceScale(refundOrderCount));
         datas.add(data);
         // todo 鏌ヨ 閫�娆鹃噾棰�
         double refundFee = feeStatisticsImpl.geRefundFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","閫�娆鹃噾棰�");
-        data.put("value", refundFee);
+        data.put("value", MoneyUtil.computePriceScale(refundFee));
         datas.add(data);
 
 
@@ -130,14 +131,14 @@
         double chargeFee = feeStatisticsImpl.getChargeFee(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","鍏呯數閲戦");
-        data.put("value", chargeFee);
+        data.put("value", MoneyUtil.computePriceScale(chargeFee));
         datas.add(data);
 
         // todo 鏌ヨ 鏈堝崱閲戦
         double chargeMonthOrderMoney = orderStatisticsImpl.getChargeMonthOrderCount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","鏈堝崱瀹炴敹");
-        data.put("value", chargeMonthOrderMoney);
+        data.put("value", MoneyUtil.computePriceScale(chargeMonthOrderMoney));
         datas.add(data);
 
 

--
Gitblit v1.8.0