sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理支付宝退款金额为amount问题

Browse Source
This commit is contained in:
eric
2025-09-08 04:56:34 +08:00
parent bd20b78b02
commit 548b45603d
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/api/DataPushApi.java
View File

@ -132,6 +132,7 @@ public class DataPushApi {
if (refundSub.getPaymentMethod().equals("WX_PAY")){
url = refundUrl;
}else {
refundRequest.setRefundAmount(refundSub.getAmount().toString());
url = alirefundUrl;
}
ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);

10
ruoyi-admin/src/main/java/com/ruoyi/orders/dto/RefundRequest.java
View File

@ -12,7 +12,7 @@ public class RefundRequest {
private BigDecimal totalFee; // 订单金额(分)
private BigDecimal refundFee; // 退款金额(分)
private String refundDesc; // 退款原因
private String refundAmount; //支付宝退款
// 构造函数
public RefundRequest() {}
@ -64,4 +64,12 @@ public class RefundRequest {
public void setRefundDesc(String refundDesc) {
this.refundDesc = refundDesc;
}
public String getRefundAmount() {
return refundAmount;
}
public void setRefundAmount(String refundAmount) {
this.refundAmount = refundAmount;
}
}

8
ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
View File

@ -204,6 +204,11 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
depositSub.setSuborderType(OrderUtil.DEPOSIT);
ZcOrderSub querySub = zcOrderSubService.selectZcOrderSub(depositSub);
ZcOrderSub battreySub = new ZcOrderSub();
battreySub.setOrderId(orderId);
battreySub.setSuborderType(OrderUtil.RENTBATTEY);
ZcOrderSub queryBattreySub = zcOrderSubService.selectZcOrderSub(depositSub);
if (querySub != null) {
ZcOrderMain queryMain = selectZcOrderMainByOrderId(orderId);
@ -217,7 +222,8 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
refundSub.setSuborderType(OrderUtil.FD_DEPOSIT);
// 如果租车订单未取车，退租车费用和押金费用
if(queryMain.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode())){
refundSub.setAmount(queryOrder.getDepositPrice().add(queryOrder.getRentalPrice()));
// 退押金和租车费用和租电费用
refundSub.setAmount(queryOrder.getDepositPrice().add(queryOrder.getRentalPrice().add(queryBattreySub.getAmount())));
}else {
// 计算实际退款金额（押金减去逾期费用）
BigDecimal overdueAmount = BigDecimal.ZERO;