Commit cb52e1b2 by rui.zhu

修复未接单订单显示为部分退问题

parent e0fad7f2
...@@ -143,7 +143,7 @@ public class RefundService { ...@@ -143,7 +143,7 @@ public class RefundService {
// 未接单 // 未接单
if (NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(order.getOrderState())) { if (NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(order.getOrderState())) {
// 商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口 // 商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
refundOrder(order, reason, remark, refundDeliveryFee, refundMode); refundOrder(order, isPartRefund, reason, remark, refundDeliveryFee, refundMode);
orderQueueService.backOrdersStatusChange(order.getOrderCode(), order.getOrderState(), order.getPayState(), order.getPartnerId()); orderQueueService.backOrdersStatusChange(order.getOrderCode(), order.getOrderState(), order.getPayState(), order.getPartnerId());
} else { } else {
// 已接单的,创建售后单 // 已接单的,创建售后单
...@@ -285,7 +285,7 @@ public class RefundService { ...@@ -285,7 +285,7 @@ public class RefundService {
* 商家未接单,取消订单逻辑处理 * 商家未接单,取消订单逻辑处理
* 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口 * 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
*/ */
private void refundOrder(OrderInfoReqs order, String reason, String remark, Boolean isRefundDeliveryFee, Byte refundMode) { private void refundOrder(OrderInfoReqs order, Boolean isPartRefund, String reason, String remark, Boolean isRefundDeliveryFee, Byte refundMode) {
int state = PayRefundStatus.SUCCESS.getCode(); int state = PayRefundStatus.SUCCESS.getCode();
List<OrderCancelReq.PayRefundItem> refundItemList = new ArrayList<>(); List<OrderCancelReq.PayRefundItem> refundItemList = new ArrayList<>();
PayRefundResponse refundResponse = null; PayRefundResponse refundResponse = null;
...@@ -302,7 +302,7 @@ public class RefundService { ...@@ -302,7 +302,7 @@ public class RefundService {
} }
Long refundAmount = refundResponse != null ? refundResponse.getRefundAmount().longValue() : null; Long refundAmount = refundResponse != null ? refundResponse.getRefundAmount().longValue() : null;
OrderCancelReq req = OrderCancelReqAdapter.convert(order, UUID.randomUUID().toString(), OrderCancelReq req = OrderCancelReqAdapter.convert(order, UUID.randomUUID().toString(),
AfterSalesType.USER_CANCEL, true, refundAmount, reason, remark, isRefundDeliveryFee, refundMode); AfterSalesType.USER_CANCEL, isPartRefund, refundAmount, reason, remark, isRefundDeliveryFee, refundMode);
req.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex()); req.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) { if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
//退款成功 //退款成功
......
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