Commit a4562544 by 咸鱼

fix:部分退款金额未set

parent a7584850
......@@ -872,6 +872,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setPartnerId(cancelOrderRequest.getPartnerId());
request.setOrderCode(cancelOrderRequest.getOrderId());
request.setReqRemark(cancelOrderRequest.getReqRemark());
request.setReqAmount(cancelOrderRequest.getReqAmount());
request.setPartRefund(cancelOrderRequest.isPartRefund());
//售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
// 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,
request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
......
......@@ -228,7 +228,7 @@ public class RefundService {
*/
private boolean isRefundDeliveryFee(OrderInfoReqs order, Long refundAmount) {
// 退款金额小于实付金额的情况,表示部分退不需要退配送费
if (refundAmount != null && refundAmount < order.getActualPayAmount().longValue()) {
if (refundAmount != null && refundAmount < order.getSettlementAmount().longValue()) {
return false;
}
boolean refundDeliveryFee = true;
......
......@@ -15,6 +15,8 @@ package com.freemud.application.sdk.api.ordercenter.request;
import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class OrderCancelReq {
......@@ -85,4 +87,14 @@ public class OrderCancelReq {
* 售后退款状态 0:未定义(存量数据) 1:未退款 2:退款中 3:退款失败 4:已退款
*/
private Integer refundState;
/**
* 部分退申请金额
*/
private BigDecimal reqAmount;
/**
* 是否部分退,默认否(全退)
*/
private boolean isPartRefund = false;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment