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

fix:JPA参数长度不对引起的启动错误

Browse Source
This commit is contained in:
ZZ 2021-10-29 16:22:33 +08:00
parent 912745b0bf
commit ec01db172d
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java
View File

@ -64,7 +64,6 @@ public class QueryEquipBusinessPolicyController {
modelCount.add(count); modelCount.add(count);
//如果这段时段结束，则重置计数器 //如果这段时段结束，则重置计数器
count = 0; count = 0;
} }
} }
//获取最后一个时段的费率值 //获取最后一个时段的费率值

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java
View File

@ -31,7 +31,7 @@ public class QueryEquipChargeStatusController {
String startChargeSeq = chargeInfoRequest.getStartChargeSeq(); String startChargeSeq = chargeInfoRequest.getStartChargeSeq();
// todo 三方对接 到et_order_mapping表查找xh_order_no // todo 三方对接 到et_order_mapping表查找xh_order_no
XhpcHistoryOrder xhpcHistoryOrder = XhpcHistoryOrder xhpcHistoryOrder =
xhpcHistoryOrderRepository.findByInternetSerialNumberOrEvcsOrderNo(startChargeSeq).orElse(null); xhpcHistoryOrderRepository.findByInternetSerialNumber(startChargeSeq).orElse(null);
ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo(xhpcHistoryOrder); ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo(xhpcHistoryOrder);
if (chargeOrderInfo == null) { if (chargeOrderInfo == null) {
throw new ServerInternalException("未查询到该订单编号数据"); throw new ServerInternalException("未查询到该订单编号数据");

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java
View File

@ -15,6 +15,6 @@ public interface XhpcHistoryOrderRepository extends JpaRepository<XhpcHistoryOrd
List<XhpcHistoryOrder> findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i); List<XhpcHistoryOrder> findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i);
Optional<XhpcHistoryOrder> findByInternetSerialNumberOrEvcsOrderNo(String startChargeSeq); Optional<XhpcHistoryOrder> findByInternetSerialNumber(String startChargeSeq);
} }

15
xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
View File

@ -57,6 +57,11 @@ public class XhpcHistoryOrder extends BaseEntity {
*/ */
private String internetSerialNumber; private String internetSerialNumber;
/**
* Evcs订单号,供监管平台和第三方使用
*/
private String evcsOrderNo;
/** /**
* 订单总价 * 订单总价
*/ */
@ -338,6 +343,16 @@ public class XhpcHistoryOrder extends BaseEntity {
this.internetSerialNumber = internetSerialNumber; this.internetSerialNumber = internetSerialNumber;
} }
public String getEvcsOrderNo() {
return evcsOrderNo;
}
public void setEvcsOrderNo(String evcsOrderNo) {
this.evcsOrderNo = evcsOrderNo;
}
public BigDecimal getTotalPrice() { public BigDecimal getTotalPrice() {
return totalPrice == null ? BigDecimal.ZERO : totalPrice; return totalPrice == null ? BigDecimal.ZERO : totalPrice;