From 248976e021d258dea683642d2591a9da22c6da5d Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 12 May 2022 11:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=B9=E8=B4=A6=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/activity/domain/XhpcHistoryOrderDomain.java | 5 +++-- .../activity/service/impl/InternetBillServiceImpl.java | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java index 896113cb..5cc0c6a9 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java @@ -1,9 +1,10 @@ package com.xhpc.activity.domain; +import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** * xhpc_history_order @@ -225,7 +226,7 @@ public class XhpcHistoryOrderDomain implements Serializable { */ private Date endTime; - private Integer stopReasonEvcs; + private String stopReasonEvcs; /** * 电量 diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java index 42de669a..cdbbcb4b 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java @@ -651,10 +651,10 @@ public class InternetBillServiceImpl implements InternetBillService { int checkoutStatus = 0; // 流量方的订单金额大于本平台的历史订单的订单金额，就可以判断成功 - if (domain.getPlatformOrderAmount() != null && domain.getPlatformOrderAmount().compareTo(domain.getInternetOrderAmount()) == 0 - && domain.getPlatformPowerAmount() != null && domain.getPlatformPowerAmount().compareTo(domain.getInternetPowerAmount()) == 0 - && domain.getPlatformServerAmount() != null && domain.getPlatformServerAmount().compareTo(domain.getInternetServerAmount()) == 0 - && domain.getPlatformChargingDegree() != null && domain.getPlatformChargingDegree().compareTo(domain.getInternetChargingDegree()) == 0) { + if (domain.getPlatformOrderAmount() != null && domain.getInternetOrderAmount() != null && domain.getPlatformOrderAmount().compareTo(domain.getInternetOrderAmount()) == 0 + && domain.getPlatformPowerAmount() != null && domain.getInternetPowerAmount() != null && domain.getPlatformPowerAmount().compareTo(domain.getInternetPowerAmount()) == 0 + && domain.getPlatformServerAmount() != null && domain.getInternetServerAmount() != null && domain.getPlatformServerAmount().compareTo(domain.getInternetServerAmount()) == 0 + && domain.getPlatformChargingDegree() != null && domain.getInternetChargingDegree() != null && domain.getPlatformChargingDegree().compareTo(domain.getInternetChargingDegree()) == 0) { checkoutStatus = 2; } domain.setStatus(checkoutStatus);