yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新对账的数据非空判断

Browse Source
This commit is contained in:
panshuling321 2022-05-12 11:38:10 +08:00
parent 5831172413
commit 248976e021
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java
View File

@ -1,9 +1,10 @@
package com.xhpc.activity.domain; package com.xhpc.activity.domain;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* xhpc_history_order * xhpc_history_order
@ -225,7 +226,7 @@ public class XhpcHistoryOrderDomain implements Serializable {
*/ */
private Date endTime; private Date endTime;
private Integer stopReasonEvcs; private String stopReasonEvcs;
/** /**
* 电量 * 电量

8
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java
View File

@ -651,10 +651,10 @@ public class InternetBillServiceImpl implements InternetBillService {
int checkoutStatus = 0; int checkoutStatus = 0;
// 流量方的订单金额大于本平台的历史订单的订单金额，就可以判断成功 // 流量方的订单金额大于本平台的历史订单的订单金额，就可以判断成功
if (domain.getPlatformOrderAmount() != null && domain.getPlatformOrderAmount().compareTo(domain.getInternetOrderAmount()) == 0 if (domain.getPlatformOrderAmount() != null && domain.getInternetOrderAmount() != null && domain.getPlatformOrderAmount().compareTo(domain.getInternetOrderAmount()) == 0
&& domain.getPlatformPowerAmount() != null && domain.getPlatformPowerAmount().compareTo(domain.getInternetPowerAmount()) == 0 && domain.getPlatformPowerAmount() != null && domain.getInternetPowerAmount() != null && domain.getPlatformPowerAmount().compareTo(domain.getInternetPowerAmount()) == 0
&& domain.getPlatformServerAmount() != null && domain.getPlatformServerAmount().compareTo(domain.getInternetServerAmount()) == 0 && domain.getPlatformServerAmount() != null && domain.getInternetServerAmount() != null && domain.getPlatformServerAmount().compareTo(domain.getInternetServerAmount()) == 0
&& domain.getPlatformChargingDegree() != null && domain.getPlatformChargingDegree().compareTo(domain.getInternetChargingDegree()) == 0) { && domain.getPlatformChargingDegree() != null && domain.getInternetChargingDegree() != null && domain.getPlatformChargingDegree().compareTo(domain.getInternetChargingDegree()) == 0) {
checkoutStatus = 2; checkoutStatus = 2;
} }
domain.setStatus(checkoutStatus); domain.setStatus(checkoutStatus);