From 82a30804419fc25c7358cc359974c9a486594efe Mon Sep 17 00:00:00 2001
From: "YAS\\29473" <2947326429@qq.com>
Date: Thu, 30 Oct 2025 08:09:56 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B4=B5=E5=B7=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8E=A5=E5=8F=A3,=E6=97=B6=E6=AE=B5?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B4=B9=E5=92=8C=E5=85=85=E7=94=B5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B4=AF=E8=AE=A1=E7=94=B5=E9=87=8F=20=E4=BF=9D?=
 =?UTF-8?q?=E7=95=992=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GuiZhouPlatformServiceImpl.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java
index 003a67bf8..c12b34cfa 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java
@@ -841,6 +841,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
         PileMerchantInfoVO pileMerchantInfoVO = pileMerchantInfoService.queryMerchantInfoByStationId(String.valueOf(stationInfo.getId()));
         String organizationCode = pileMerchantInfoVO.getOrganizationCode();
 
+        // 保留两位小数
+        stationTotalElectricity= stationTotalElectricity.setScale(2, RoundingMode.HALF_UP);
+
         // 创建对象
         String startTime = DateUtils.getYesterdayStr();
         String endTime = DateUtils.getYesterdayStr();
@@ -892,6 +895,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      *
      * @return
      */
+    @Override
     public String notificationPowerInfo(List<String> stationIds) {
         List<SupStationPowerInfo> list = new ArrayList<>();
         String dateTimeNow = DateUtils.dateTimeNow(DateUtils.YYYY_MM_DD_HH_MM_SS);
@@ -1081,6 +1085,8 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
         SupChargeDetails detail;
         for (BillingPriceVO billingPriceVO : billingList) {
             detail = new SupChargeDetails();
+            //保留2位小数
+            BigDecimal detailServiceMoney = orderDetail.getSharpServicePrice().setScale(2, RoundingMode.HALF_UP);
             if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.SHARP.getValue())) {
                 // 尖时段
                 detail.setDetailStartTime(DateUtils.getDateTime());
@@ -1089,7 +1095,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
                 detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
                 detail.setDetailPower(orderDetail.getSharpUsedElectricity());
                 detail.setDetailElecMoney(orderDetail.getSharpElectricityPrice());
-                detail.setDetailServiceMoney(orderDetail.getSharpServicePrice());
+                detail.setDetailServiceMoney(detailServiceMoney);
             } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.PEAK.getValue())) {
                 // 峰时段
                 detail.setDetailStartTime(DateUtils.getDateTime());
@@ -1098,7 +1104,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
                 detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
                 detail.setDetailPower(orderDetail.getPeakUsedElectricity());
                 detail.setDetailElecMoney(orderDetail.getPeakElectricityPrice());
-                detail.setDetailServiceMoney(orderDetail.getPeakServicePrice());
+                detail.setDetailServiceMoney(detailServiceMoney);
             } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.FLAT.getValue())) {
                 // 平时段
                 detail.setDetailStartTime(DateUtils.getDateTime());
@@ -1107,7 +1113,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
                 detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
                 detail.setDetailPower(orderDetail.getFlatUsedElectricity());
                 detail.setDetailElecMoney(orderDetail.getFlatElectricityPrice());
-                detail.setDetailServiceMoney(orderDetail.getFlatServicePrice());
+                detail.setDetailServiceMoney(detailServiceMoney);
             } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.VALLEY.getValue())) {
                 // 谷时段
                 detail.setDetailStartTime(DateUtils.getDateTime());
@@ -1116,7 +1122,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
                 detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
                 detail.setDetailPower(orderDetail.getValleyUsedElectricity());
                 detail.setDetailElecMoney(orderDetail.getValleyElectricityPrice());
-                detail.setDetailServiceMoney(orderDetail.getValleyServicePrice());
+                detail.setDetailServiceMoney(detailServiceMoney);
             }
             resultList.add(detail);
         }