From c9d8c1d52b989fab4b01136968c84db4475a6044 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 14:26:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/HardOrderTotalController.java | 12 ++++++------ .../main/resources/file/部门交易金额汇总.xlsx | Bin 10062 -> 10059 bytes 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java index b3eac7a16..0b8618750 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java @@ -162,8 +162,8 @@ public class HardOrderTotalController { if (ObjectUtil.isNotEmpty(list)) { BigDecimal walletPriceSum = BigDecimal.ZERO; BigDecimal walletCountSum = BigDecimal.ZERO; - BigDecimal totalPayPriceSum = BigDecimal.ZERO; - BigDecimal totalPayCountSum = BigDecimal.ZERO; + BigDecimal orderPayPriceSum = BigDecimal.ZERO; + BigDecimal orderPayCountSum = BigDecimal.ZERO; BigDecimal orderRefundPriceSum = BigDecimal.ZERO; BigDecimal orderRefundContSum = BigDecimal.ZERO; for (HardDeptTotalVo v : list) { @@ -176,11 +176,11 @@ public class HardOrderTotalController { v.setWalletCount(BigDecimal.valueOf(v.getWalletCount()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); } if (ObjectUtil.isNotEmpty(v.getOrderPayPrice())) { - totalPayPriceSum = totalPayPriceSum.add(BigDecimal.valueOf(v.getOrderPayPrice())); + orderPayPriceSum = orderPayPriceSum.add(BigDecimal.valueOf(v.getOrderPayPrice())); v.setOrderPayPrice(BigDecimal.valueOf(v.getOrderPayPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); } if (ObjectUtil.isNotEmpty(v.getOrderPayCount())) { - totalPayCountSum = totalPayCountSum.add(BigDecimal.valueOf(v.getOrderPayCount())); + orderPayCountSum = orderPayCountSum.add(BigDecimal.valueOf(v.getOrderPayCount())); v.setOrderPayCount(BigDecimal.valueOf(v.getOrderPayCount()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); } if (ObjectUtil.isNotEmpty(v.getOrderRefundPrice())) { @@ -193,8 +193,8 @@ public class HardOrderTotalController { } map.put("walletPriceSum", walletPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); map.put("walletCountSum", walletCountSum.toString()); - map.put("totalPayPriceSum", totalPayPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); - map.put("totalPayCountSum", totalPayCountSum.toString()); + map.put("orderPayPriceSum", orderPayPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + map.put("orderPayCountSum", orderPayCountSum.toString()); map.put("orderRefundPriceSum", orderRefundPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); map.put("orderRefundContSum", orderRefundContSum.toString()); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx index f0d9426b8070641c31dd88d573eaf5452c1c7643..9b748b9782bbab681cbe45a1f101c6d615be3788 100644 GIT binary patch delta 1663 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 WxRQ|^0{{TvlL#k01~DT50000?Y6Kww