From 5eb115098ad9b7f857735907a1d0fde054ff8fb0 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Fri, 27 Jun 2025 16:00:24 +0800 Subject: [PATCH] update --- .../common/enums/thirdparty/ThirdPlatformTypeEnum.java | 2 +- .../service/impl/ChangZhouPlatformServiceImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java index 5432c6d2f..37527af5f 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java @@ -36,7 +36,7 @@ public enum ThirdPlatformTypeEnum { WEI_WANG_XIN_DIAN("23", "微网新电", "MA005DBW1"), HU_ZHOU_PLATFORM("24", "湖州市监管平台", "MA27U00HZ"), CHANG_ZHOU_PLATFORM("25", "新运常畅充", "0585PCW57"), - SI_CHUAN_PLATFORM("26", "四川省平台", ""), + SI_CHUAN_PLATFORM("26", "四川省平台", "MA01H3BQ2"), JI_LIN_PLATFORM("27", "吉林省平台", ""), ; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java index 4af81590c..46112a2a2 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java @@ -825,9 +825,12 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService { //《***优惠金额***》 //优惠电费 - BigDecimal discountElectricityAmount = orderDetail.getDiscountElectricityAmount(); + BigDecimal discountElectricityAmount = + orderDetail.getDiscountElectricityAmount() == null ? BigDecimal.ZERO:orderDetail.getDiscountElectricityAmount(); //优惠服务费 - BigDecimal discountServiceAmount = orderDetail.getDiscountServiceAmount(); + BigDecimal discountServiceAmount = + orderDetail.getDiscountServiceAmount() == null ? BigDecimal.ZERO:orderDetail.getDiscountServiceAmount(); + //《***优惠后***》 //电费