mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-13 14:30:08 +08:00
update
This commit is contained in:
@@ -3065,6 +3065,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {
|
if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {
|
||||||
// 如果订单状态是待补缴,表示已经停止充电了,需要补缴费用,补缴完成订单状态改为订单完成,设置结算时间
|
// 如果订单状态是待补缴,表示已经停止充电了,需要补缴费用,补缴完成订单状态改为订单完成,设置结算时间
|
||||||
orderInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
|
orderInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
|
||||||
|
orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue());
|
||||||
orderInfo.setSettlementTime(new Date());
|
orderInfo.setSettlementTime(new Date());
|
||||||
BigDecimal remedialAmount = orderInfo.getRemedialAmount();
|
BigDecimal remedialAmount = orderInfo.getRemedialAmount();
|
||||||
orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount));
|
orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount));
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
|
|||||||
OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord();
|
OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord();
|
||||||
|
|
||||||
payInfo.setPayAmount(orderPayRecord.getPayAmount().toString());
|
payInfo.setPayAmount(orderPayRecord.getPayAmount().toString());
|
||||||
// payInfo.setPayStatus(orderBasicInfo.getPayStatus());
|
payInfo.setPayStatus(orderBasicInfo.getPayStatus());
|
||||||
payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
|
payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
|
||||||
payInfo.setRefundAmount(String.valueOf(orderPayRecord.getRefundAmount()));
|
payInfo.setRefundAmount(String.valueOf(orderPayRecord.getRefundAmount()));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user