From ec01db172d960bdc578cf67659d63cc73ed37515 Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 29 Oct 2021 16:22:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:JPA=E5=8F=82=E6=95=B0=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E5=BC=95=E8=B5=B7=E7=9A=84=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/QueryEquipBusinessPolicyController.java | 1 - .../api/QueryEquipChargeStatusController.java | 2 +- .../xhpc/evcs/jpa/XhpcHistoryOrderRepository.java | 2 +- .../com/xhpc/order/domain/XhpcHistoryOrder.java | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java index 8f307e9a..bc8ce2d4 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java @@ -64,7 +64,6 @@ public class QueryEquipBusinessPolicyController { modelCount.add(count); //如果这段时段结束，则重置计数器 count = 0; - } } //获取最后一个时段的费率值 diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java index 1c523136..53375073 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java @@ -31,7 +31,7 @@ public class QueryEquipChargeStatusController { String startChargeSeq = chargeInfoRequest.getStartChargeSeq(); // todo 三方对接 到et_order_mapping表查找xh_order_no XhpcHistoryOrder xhpcHistoryOrder = - xhpcHistoryOrderRepository.findByInternetSerialNumberOrEvcsOrderNo(startChargeSeq).orElse(null); + xhpcHistoryOrderRepository.findByInternetSerialNumber(startChargeSeq).orElse(null); ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo(xhpcHistoryOrder); if (chargeOrderInfo == null) { throw new ServerInternalException("未查询到该订单编号数据"); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java index bdbeea98..c9638a7a 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java @@ -15,6 +15,6 @@ public interface XhpcHistoryOrderRepository extends JpaRepository findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i); - Optional findByInternetSerialNumberOrEvcsOrderNo(String startChargeSeq); + Optional findByInternetSerialNumber(String startChargeSeq); } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java index 1639fc57..f26b160e 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java @@ -57,6 +57,11 @@ public class XhpcHistoryOrder extends BaseEntity { */ private String internetSerialNumber; + /** + * Evcs订单号,供监管平台和第三方使用 + */ + private String evcsOrderNo; + /** * 订单总价 */ @@ -338,6 +343,16 @@ public class XhpcHistoryOrder extends BaseEntity { this.internetSerialNumber = internetSerialNumber; } + public String getEvcsOrderNo() { + + return evcsOrderNo; + } + + public void setEvcsOrderNo(String evcsOrderNo) { + + this.evcsOrderNo = evcsOrderNo; + } + public BigDecimal getTotalPrice() { return totalPrice == null ? BigDecimal.ZERO : totalPrice;