qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-03-24 08:38:57 +08:00
parent fbb70d1969
commit 2cab5d0b73
1 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -902,6 +902,7 @@ public class EtOrderServiceImpl implements IEtOrderService
EtOrder etOrder1 = new EtOrder();
etOrder1.setStatus(ServiceConstants.ORDER_STATUS_ORDER_END);
etOrder1.setOrderId(etOrder.getOrderId());
Boolean execute = transactionTemplate.execute(e -> {
int updateEtOrder = etOrderMapper.updateEtOrder(etOrder1);
if(updateEtOrder == 0){
throw new ServiceException("还车审核失败，更新订单失败");
@ -913,7 +914,6 @@ public class EtOrderServiceImpl implements IEtOrderService
BigDecimal deductionAmount = new BigDecimal(etOrder.getDeductionAmount());
BigDecimal residualDeposit = depositOrder.getTotalFee().subtract(deductionAmount);//抵扣后的金额
String refNo = IdUtils.getOrderNo("ref");
wxPayService.refund(depositOrder, "还车审核通过后退押金",residualDeposit,refNo);
/** 3.记录退款表 创建退款对象*/
depositOrder.setReason("还车审核通过后退押金");
if(deductionAmount.compareTo(BigDecimal.ZERO) > 0){
@ -942,9 +942,15 @@ public class EtOrderServiceImpl implements IEtOrderService
callbackService.capitalFlowRecords(etOrder,ServiceConstants.FLOW_TYPE_INCOME,ServiceConstants.ORDER_TYPE_VEHICLE_DAMAGE,
ServiceConstants.OWNER_TYPE_OPERATOR,null,ServiceConstants.PAY_TYPE_YJ,null,null);
}
if(BigDecimal.ZERO.compareTo(residualDeposit) < 0){
wxPayService.refund(depositOrder, "还车审核通过后退押金",residualDeposit,refNo);
}
}else{
log.info("【还车审核通过】当前用户押金已退款！！------不退押金");
}
return Boolean.TRUE;
});
if(Boolean.FALSE.equals(execute))throw new ServiceException("官方审核通过失败");
return true;
}