mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-23 20:45:10 +08:00
bugfix 修复订单中 保险金额字段为0的bug
This commit is contained in:
@@ -4264,7 +4264,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
orderInfo.setPayAmount(orderPayAmount.add(payAmount));
|
||||
}
|
||||
orderInfo.setPayTime(new Date());
|
||||
|
||||
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)) {
|
||||
@@ -4803,6 +4802,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
.settleAmount(BigDecimal.ZERO)
|
||||
.startType(dto.getStartType())
|
||||
.build();
|
||||
if (dto.getInsuranceAmount().compareTo(BigDecimal.ZERO) > 0) {
|
||||
orderBasicInfo.setInsuranceAmount(dto.getInsuranceAmount());
|
||||
}
|
||||
if (StringUtils.equals(OrderTypeEnum.MERGE_CHARGE_ORDER.getValue(), dto.getOrderType())) {
|
||||
// 并充订单
|
||||
orderBasicInfo.setOrderType(dto.getOrderType());
|
||||
|
||||
Reference in New Issue
Block a user