autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix 修复订单中 保险金额字段为0的bug

Browse Source
This commit is contained in:
Lemon
2025-09-16 15:36:48 +08:00
parent f099c480ed
commit 9b5831ebc1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
View File

@@ -55,6 +55,11 @@ public class GenerateOrderDTO extends BasicPileDTO{
*/ */
private BigDecimal chargeAmount; private BigDecimal chargeAmount;
/**
* 保险金额
*/
private BigDecimal insuranceAmount;
/** /**
* 充电桩枪口信息 * 充电桩枪口信息
*/ */

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -4264,7 +4264,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderInfo.setPayAmount(orderPayAmount.add(payAmount)); orderInfo.setPayAmount(orderPayAmount.add(payAmount));
} }
orderInfo.setPayTime(new Date()); orderInfo.setPayTime(new Date());
String pileSn = orderInfo.getPileSn(); String pileSn = orderInfo.getPileSn();
// 发送启动充电指令前，再次下发计费模板 // 发送启动充电指令前，再次下发计费模板
@@ -4283,7 +4282,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
} }
// 获取启动金额 // 获取启动金额
BigDecimal chargeAmount = computeChargeAmount(orderInfo.getMerchantId(), orderInfo.getStationId(), orderInfo.getMemberId(), orderInfo.getPayAmount()); BigDecimal chargeAmount = computeChargeAmount(orderInfo.getMerchantId(), orderInfo.getStationId(), orderInfo.getMemberId(), dto.getPayAmount());
// 发送启动指令 // 发送启动指令
if (StringUtils.equals(pileConnectorDetailVO.getChargePortType(), Constants.THREE)) { if (StringUtils.equals(pileConnectorDetailVO.getChargePortType(), Constants.THREE)) {
@@ -4803,6 +4802,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.settleAmount(BigDecimal.ZERO) .settleAmount(BigDecimal.ZERO)
.startType(dto.getStartType()) .startType(dto.getStartType())
.build(); .build();
if (dto.getInsuranceAmount().compareTo(BigDecimal.ZERO) > 0) {
orderBasicInfo.setInsuranceAmount(dto.getInsuranceAmount());
}
if (StringUtils.equals(OrderTypeEnum.MERGE_CHARGE_ORDER.getValue(), dto.getOrderType())) { if (StringUtils.equals(OrderTypeEnum.MERGE_CHARGE_ORDER.getValue(), dto.getOrderType())) {
// 并充订单 // 并充订单
orderBasicInfo.setOrderType(dto.getOrderType()); orderBasicInfo.setOrderType(dto.getOrderType());